From 52cd6ac4f45c44f565204764d3ec7449db0595ea Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Fri, 12 Apr 2024 16:14:28 +0100 Subject: [PATCH 01/16] onr-web: comment out all tasks I will re-add these, editing and testing as I go. --- ansible/roles/onr-web/tasks/main.yml | 83 ++++++++++++++-------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/ansible/roles/onr-web/tasks/main.yml b/ansible/roles/onr-web/tasks/main.yml index 6beffbb00..5042d3f04 100644 --- a/ansible/roles/onr-web/tasks/main.yml +++ b/ansible/roles/onr-web/tasks/main.yml @@ -1,45 +1,46 @@ --- -- import_tasks: get_facts.yml - tags: - - amibuild - - ec2provision - when: ansible_distribution in ['RedHat'] - -- import_tasks: install_packages.yml - tags: - - amibuild - - ec2provision - when: ansible_distribution in ['RedHat'] - -- import_tasks: add_groups.yml - tags: - - amibuild - - ec2provision - when: ansible_distribution in ['RedHat'] - -- import_tasks: assign_permissions.yml - tags: - - amibuild - - ec2provision - when: ansible_distribution in ['RedHat'] - -- import_tasks: retrieve_files.yml - tags: - - amibuild - - ec2provision - when: ansible_distribution in ['RedHat'] - -- import_tasks: extract_files.yml - tags: - - amibuild - - ec2provision - when: ansible_distribution in ['RedHat'] - -- import_tasks: add_response_file.yml - tags: - - amibuild - - ec2provision - when: ansible_distribution in ['RedHat'] +# - import_tasks: get_facts.yml +# tags: +# - amibuild +# - ec2provision +# when: ansible_distribution in ['RedHat'] + +# - import_tasks: install_packages.yml +# tags: +# - amibuild +# - ec2provision +# when: ansible_distribution in ['RedHat'] + +# - import_tasks: add_groups.yml +# tags: +# - amibuild +# - ec2provision +# when: ansible_distribution in ['RedHat'] + +# - import_tasks: assign_permissions.yml +# tags: +# - amibuild +# - ec2provision +# when: ansible_distribution in ['RedHat'] + +# - import_tasks: retrieve_files.yml +# tags: +# - amibuild +# - ec2provision +# when: ansible_distribution in ['RedHat'] + +# - import_tasks: extract_files.yml +# tags: +# - amibuild +# - ec2provision +# when: ansible_distribution in ['RedHat'] + +# - import_tasks: add_response_file.yml +# tags: +# - amibuild +# - ec2provision +# when: ansible_distribution in ['RedHat'] + # - import_tasks: install_tomcat.yml # tags: # - amibuild From 26516b5efdb1c5f1bdaf89bcc08e682a08ab32da Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Fri, 12 Apr 2024 16:16:19 +0100 Subject: [PATCH 02/16] onr-tomcat: import onr-get role This will replace the retrieve_files and extract_files tasks. --- ansible/roles/onr-web/tasks/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ansible/roles/onr-web/tasks/main.yml b/ansible/roles/onr-web/tasks/main.yml index 5042d3f04..5029107a9 100644 --- a/ansible/roles/onr-web/tasks/main.yml +++ b/ansible/roles/onr-web/tasks/main.yml @@ -35,6 +35,13 @@ # - ec2provision # when: ansible_distribution in ['RedHat'] +- import_role: + name: onr-get + tags: + - amibuild + - ec2provision + when: ansible_distribution in ['RedHat'] + # - import_tasks: add_response_file.yml # tags: # - amibuild From 3c084d46021398d7f338d2658e67bcec917738ea Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Mon, 15 Apr 2024 13:24:29 +0100 Subject: [PATCH 03/16] onr(web): remove libxcrypt from package list It's not available in RHEL 6. --- ansible/group_vars/server_type_onr_web.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/group_vars/server_type_onr_web.yml b/ansible/group_vars/server_type_onr_web.yml index 1e105f596..994f69a34 100644 --- a/ansible/group_vars/server_type_onr_web.yml +++ b/ansible/group_vars/server_type_onr_web.yml @@ -55,7 +55,6 @@ packages_yum_install: - libXext.x86_64 - expat.i686 - expat.x86_64 - - libxcrypt.i686 - libgcc.i686 - libgcc.x86_64 - libnsl.i686 From 127ce7b7c548bc360aa34b179970c882ef6c361c Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Mon, 15 Apr 2024 13:31:50 +0100 Subject: [PATCH 04/16] onr(web): remove libnsl from package list It's not available in RHEL 6. --- ansible/group_vars/server_type_onr_web.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/group_vars/server_type_onr_web.yml b/ansible/group_vars/server_type_onr_web.yml index 994f69a34..00ace0a9d 100644 --- a/ansible/group_vars/server_type_onr_web.yml +++ b/ansible/group_vars/server_type_onr_web.yml @@ -57,7 +57,6 @@ packages_yum_install: - expat.x86_64 - libgcc.i686 - libgcc.x86_64 - - libnsl.i686 - libXcursor.i686 - libXcursor.x86_64 - libXrender.i686 From e0e79bdc0116cdd42b1d568ae0397841a07f8ad5 Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Mon, 15 Apr 2024 13:59:43 +0100 Subject: [PATCH 05/16] onr(web): replace ncr-tomcat role with onr-web --- ansible/group_vars/server_type_onr_web.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/server_type_onr_web.yml b/ansible/group_vars/server_type_onr_web.yml index 00ace0a9d..45f48e51f 100644 --- a/ansible/group_vars/server_type_onr_web.yml +++ b/ansible/group_vars/server_type_onr_web.yml @@ -33,7 +33,7 @@ server_type_roles_list: - ansible-script - epel # - disks - # - ncr-tomcat >> change to onr-tomcat, can't entirely re-use this + - onr-web - collectd - amazon-cloudwatch-agent - amazon-cloudwatch-agent-collectd From d01f87eaabcc401b0225fe81de986bb79208ea04 Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Tue, 16 Apr 2024 13:15:38 +0100 Subject: [PATCH 06/16] onr(web): readd get_facts task --- ansible/roles/onr-web/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/roles/onr-web/tasks/main.yml b/ansible/roles/onr-web/tasks/main.yml index 5029107a9..c7592e97c 100644 --- a/ansible/roles/onr-web/tasks/main.yml +++ b/ansible/roles/onr-web/tasks/main.yml @@ -1,9 +1,9 @@ --- -# - import_tasks: get_facts.yml -# tags: -# - amibuild -# - ec2provision -# when: ansible_distribution in ['RedHat'] +- import_tasks: get_facts.yml + tags: + - amibuild + - ec2provision + when: ansible_distribution in ['RedHat'] # - import_tasks: install_packages.yml # tags: From 2dc84e92789841bb80285ebfeac1058a2fc02af7 Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Tue, 16 Apr 2024 17:43:52 +0100 Subject: [PATCH 07/16] onr(web): translate secret keys from ncr to onr --- ansible/roles/onr-web/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/onr-web/defaults/main.yml b/ansible/roles/onr-web/defaults/main.yml index 9e511f512..b0eba231f 100644 --- a/ansible/roles/onr-web/defaults/main.yml +++ b/ansible/roles/onr-web/defaults/main.yml @@ -5,7 +5,7 @@ sap_bi_platform_extraction_directory: /u02/software/BIP_4_3_SP1 sap_bi_platform_installation_directory: /u01/app/bobj/BIP4 sap_jvm_unpack_base_directory: /opt/sap/java -ncr_environment: "{{ ec2.tags['nomis-combined-reporting-environment'] }}" +onr_environment: "{{ ec2.tags['oasys-national-reporting-environment'] }}" cms_name: "{{ ncr_environment }}-ncr-cms" s3: @@ -28,6 +28,6 @@ tomcat_post_install_directories: tomcat_admin_secretsmanager_passwords: tomcat_admin: - secret: "/ec2/ncr-tomcat-admin/{{ ncr_environment }}/passwords" + secret: "/ec2/onr-tomcat-admin/{{ onr_environment }}/passwords" users: - tomcat_admin: auto From 3b4e9998a0cbb69f3f176ee9b4d1d7d579f45ba2 Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Mon, 22 Apr 2024 11:49:09 +0100 Subject: [PATCH 08/16] onr-web: change secret name to match deployed name --- ansible/roles/onr-web/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/onr-web/defaults/main.yml b/ansible/roles/onr-web/defaults/main.yml index b0eba231f..b3fb104d7 100644 --- a/ansible/roles/onr-web/defaults/main.yml +++ b/ansible/roles/onr-web/defaults/main.yml @@ -28,6 +28,6 @@ tomcat_post_install_directories: tomcat_admin_secretsmanager_passwords: tomcat_admin: - secret: "/ec2/onr-tomcat-admin/{{ onr_environment }}/passwords" + secret: "/ec2/onr-web/{{ onr_environment }}/passwords" users: - tomcat_admin: auto From 99a0462938e496cec2f7c8522273ff325d67684c Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Mon, 22 Apr 2024 15:27:33 +0100 Subject: [PATCH 09/16] onr-web: envrionment name sourced from default tag Source the environment name from the tag `environment-name`, which is provided in the Terraform by default. Strip the application name from the beginning. So we only get the environment name itself. --- ansible/roles/onr-web/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/onr-web/defaults/main.yml b/ansible/roles/onr-web/defaults/main.yml index b3fb104d7..d6a29347f 100644 --- a/ansible/roles/onr-web/defaults/main.yml +++ b/ansible/roles/onr-web/defaults/main.yml @@ -5,7 +5,7 @@ sap_bi_platform_extraction_directory: /u02/software/BIP_4_3_SP1 sap_bi_platform_installation_directory: /u01/app/bobj/BIP4 sap_jvm_unpack_base_directory: /opt/sap/java -onr_environment: "{{ ec2.tags['oasys-national-reporting-environment'] }}" +onr_environment: "{{ ec2.tags['environment-name'] | regex_replace('^oasys-national-reporting-', '') }}" cms_name: "{{ ncr_environment }}-ncr-cms" s3: From 7ce9d3cbc19d9cf14df7488324a4e436175c7d46 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Tue, 28 May 2024 18:13:21 +0100 Subject: [PATCH 10/16] add todo items and remove sections --- ansible/group_vars/server_type_onr_web.yml | 41 ++--- .../roles/onr-boe/tasks/install-boe-patch.yml | 5 + ansible/roles/onr-boe/tasks/main.yml | 5 + ansible/roles/onr-web/defaults/main.yml | 44 ++--- ansible/roles/onr-web/tasks/extract_files.yml | 29 ---- .../tasks/post_installation_config.yml | 69 -------- .../roles/onr-web/tasks/retrieve_files.yml | 52 ------ ansible/roles/onr-web/templates/context.xml | 37 ----- .../templates/properties/BILogon.properties | 55 ------ .../templates/properties/CmcApp.properties | 28 ---- .../templates/properties/FioriBI.properties | 60 ------- .../properties/OpenDocument.properties | 36 ---- .../properties/PlatformServices.properties | 13 -- .../templates/properties/biprws.properties | 29 ---- .../templates/properties/global.properties | 29 ---- .../templates/root/BIP_profile_icon.png | 0 .../templates/root/BIP_profile_menu_70pct.png | 0 .../roles/onr-web/templates/root/BIlogoff.jsp | 17 -- .../onr-web/templates/root/BrowserCheck.jsp | 24 --- .../templates/root/BrowserCheck_Offline.jsp | 17 -- .../roles/onr-web/templates/root/InfoView.ico | 0 .../templates/root/Unsupported_Browser.html | 16 -- .../onr-web/templates/root/browsercheck.css | 38 ----- .../onr-web/templates/root/browsercheck.js | 33 ---- .../roles/onr-web/templates/root/index.jsp | 11 -- .../onr-web/templates/root/keepalive.htm | 6 - ansible/roles/onr-web/templates/server.xml | 157 ------------------ ansible/roles/onr-web/templates/setenv.sh | 7 - .../app/bobj/BIP4/sap_bobj/init/setupinit.sh | 106 ------------ ansible/roles/onr-web/templates/wdeploy.conf | 29 ---- 30 files changed, 49 insertions(+), 944 deletions(-) create mode 100644 ansible/roles/onr-boe/tasks/install-boe-patch.yml delete mode 100644 ansible/roles/onr-web/tasks/extract_files.yml delete mode 100644 ansible/roles/onr-web/tasks/post_installation_config.yml delete mode 100644 ansible/roles/onr-web/tasks/retrieve_files.yml delete mode 100644 ansible/roles/onr-web/templates/context.xml delete mode 100644 ansible/roles/onr-web/templates/properties/BILogon.properties delete mode 100644 ansible/roles/onr-web/templates/properties/CmcApp.properties delete mode 100644 ansible/roles/onr-web/templates/properties/FioriBI.properties delete mode 100644 ansible/roles/onr-web/templates/properties/OpenDocument.properties delete mode 100644 ansible/roles/onr-web/templates/properties/PlatformServices.properties delete mode 100644 ansible/roles/onr-web/templates/properties/biprws.properties delete mode 100644 ansible/roles/onr-web/templates/properties/global.properties delete mode 100644 ansible/roles/onr-web/templates/root/BIP_profile_icon.png delete mode 100644 ansible/roles/onr-web/templates/root/BIP_profile_menu_70pct.png delete mode 100644 ansible/roles/onr-web/templates/root/BIlogoff.jsp delete mode 100644 ansible/roles/onr-web/templates/root/BrowserCheck.jsp delete mode 100644 ansible/roles/onr-web/templates/root/BrowserCheck_Offline.jsp delete mode 100644 ansible/roles/onr-web/templates/root/InfoView.ico delete mode 100644 ansible/roles/onr-web/templates/root/Unsupported_Browser.html delete mode 100644 ansible/roles/onr-web/templates/root/browsercheck.css delete mode 100644 ansible/roles/onr-web/templates/root/browsercheck.js delete mode 100644 ansible/roles/onr-web/templates/root/index.jsp delete mode 100644 ansible/roles/onr-web/templates/root/keepalive.htm delete mode 100644 ansible/roles/onr-web/templates/server.xml delete mode 100644 ansible/roles/onr-web/templates/setenv.sh delete mode 100644 ansible/roles/onr-web/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh delete mode 100644 ansible/roles/onr-web/templates/wdeploy.conf diff --git a/ansible/group_vars/server_type_onr_web.yml b/ansible/group_vars/server_type_onr_web.yml index 45f48e51f..b7c00eec1 100644 --- a/ansible/group_vars/server_type_onr_web.yml +++ b/ansible/group_vars/server_type_onr_web.yml @@ -2,23 +2,23 @@ ansible_python_interpreter: /usr/bin/python3.9 # TODO: Users and Disks roles need checking versus what we're actually deploying -# FIXME: ncr-tomcat role probably needs to be either made 'generic' or we need an onr-tomcat role -# users_and_groups_system: -# - name: oracle -# group: oinstall -# groups: -# - dba -# - wheel -# - name: bobj -# group: binstall -# groups: -# - dba -# - sapsys +# TODO: implement the same users/groups values as in onr-boe basically +users_and_groups_system: + - name: oracle + group: oinstall + groups: + - dba + - wheel + - name: bobj + group: binstall + groups: + - dba + - sapsys server_type_roles_list: - # - sshd-config - # - users-and-groups + - sshd-config + - users-and-groups - sudoers - get-ec2-facts - set-ec2-hostname @@ -32,15 +32,17 @@ server_type_roles_list: - amazon-cli - ansible-script - epel - # - disks + - disks - onr-web - - collectd - - amazon-cloudwatch-agent - - amazon-cloudwatch-agent-collectd - - collectd-service-metrics + # TODO: comment these back in later + # - collectd + # - amazon-cloudwatch-agent + # - amazon-cloudwatch-agent-collectd + # - collectd-service-metrics roles_list: "{{ (ami_roles_list | default([]) | difference(server_type_roles_list | default([]))) + (server_type_roles_list | default([])) }}" +# TODO: check these packages vs. the onr-boe package list packages_yum_install: - nano - vim @@ -69,6 +71,7 @@ packages_yum_install: - libXau.x86_64 - xz-libs.i686 +# TODO: check the disks vs. the onr-web defaults in the terraform disks_mount: - ebs_device_name: /dev/sdb dir: /u01 diff --git a/ansible/roles/onr-boe/tasks/install-boe-patch.yml b/ansible/roles/onr-boe/tasks/install-boe-patch.yml new file mode 100644 index 000000000..fa8f378f3 --- /dev/null +++ b/ansible/roles/onr-boe/tasks/install-boe-patch.yml @@ -0,0 +1,5 @@ +--- +# - name: Check that the patch file is available TODO: fix this +# ansible.builtin.stat: +# path: "{{ stage }}/{{ boe_patch }}" +# register: patch_file diff --git a/ansible/roles/onr-boe/tasks/main.yml b/ansible/roles/onr-boe/tasks/main.yml index ecb61f016..f3e0b6b58 100644 --- a/ansible/roles/onr-boe/tasks/main.yml +++ b/ansible/roles/onr-boe/tasks/main.yml @@ -37,3 +37,8 @@ tags: - amibuild - ec2provision + +- import_tasks: install-boe-patch.yml + tags: + - amibuild + - ec2provision diff --git a/ansible/roles/onr-web/defaults/main.yml b/ansible/roles/onr-web/defaults/main.yml index d6a29347f..5a41e4920 100644 --- a/ansible/roles/onr-web/defaults/main.yml +++ b/ansible/roles/onr-web/defaults/main.yml @@ -1,33 +1,23 @@ --- -bip_bucket_name: nomis-combined-reporting-bip-packages20230612143115114600000001 -sap_bi_platform_unpack_base_directory: /opt/sap/bip -sap_bi_platform_extraction_directory: /u02/software/BIP_4_3_SP1 -sap_bi_platform_installation_directory: /u01/app/bobj/BIP4 -sap_jvm_unpack_base_directory: /opt/sap/java +artefacts_s3_bucket_name: mod-platform-image-artefact-bucket20230203091453221500000001 +artefacts_s3_bucket_path: hmpps/onr +artefact_dir: /u02 +app_dir: /u01/software/BOE_3_1_FP7_4_Linux +onr_environment: "{{ ec2.tags['oasys-national-reporting-environment'] }}" -onr_environment: "{{ ec2.tags['environment-name'] | regex_replace('^oasys-national-reporting-', '') }}" -cms_name: "{{ ncr_environment }}-ncr-cms" +boe_install_user: bobj +boe_install_group: binstall -s3: - bip_bucket_name: nomis-combined-reporting-bip-packages20230612143115114600000001 - packages_prefix: BIP/ - files: - sap_bi_platform: - - BIPLATS4303P_300-70002683_P1.EXE - - BIPLATS4303P_300-70002683_P2.RAR - sap_jvm: SAPJVM8_94-80000202.SAR - sapcar: SAPCAR_1324-80000935.EXE +stage: "{{ artefact_dir }}/stage" +temp: "{{ artefact_dir }}/temp" -ssm_parameters_prefix: "tomcat" +# onr_environment: "{{ ec2.tags['environment-name'] | regex_replace('^oasys-national-reporting-', '') }}" +# cms_name: "{{ ncr_environment }}-ncr-cms" -tomcat_post_install_directories: - tomcat: /u01/app/bobj/BIP4/sap_bobj/tomcat - custom_config: /u01/app/bobj/BIP4/sap_bobj/enterprise_xi40/warfiles/webapps/BOE/WEB-INF/config/custom - biprws_config: /u01/app/bobj/BIP4/sap_bobj/enterprise_xi40/warfiles/webapps/biprws/WEB-INF/config/custom - webapps_root: /u01/app/bobj/BIP4/sap_bobj/enterprise_xi40/warfiles/webapps/ROOT +# ssm_parameters_prefix: "tomcat" -tomcat_admin_secretsmanager_passwords: - tomcat_admin: - secret: "/ec2/onr-web/{{ onr_environment }}/passwords" - users: - - tomcat_admin: auto +# tomcat_admin_secretsmanager_passwords: +# tomcat_admin: +# secret: "/ec2/onr-web/{{ onr_environment }}/passwords" +# users: +# - tomcat_admin: auto diff --git a/ansible/roles/onr-web/tasks/extract_files.yml b/ansible/roles/onr-web/tasks/extract_files.yml deleted file mode 100644 index 7133cbb48..000000000 --- a/ansible/roles/onr-web/tasks/extract_files.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# unpack the SAP BIP rar archive - -- name: Check if setup.sh file exists - stat: - path: "{{ sap_bi_platform_extraction_directory }}/setup.sh" - register: result - -- name: Unpack the install files - block: - - name: Unpack the rar file - shell: /usr/local/bin/unrar x -y BIPLATS4303P_300-70002683_P1.exe - args: - chdir: "{{ sap_bi_platform_unpack_base_directory }}" - when: sap_bi_platform_unpack_base_directory is defined - - - name: Untar the unpacked archive - ansible.builtin.unarchive: - src: "{{ sap_bi_platform_unpack_base_directory }}/BISERVONE.tgz" - dest: "{{ sap_bi_platform_extraction_directory }}" - remote_src: yes - when: sap_bi_platform_unpack_base_directory is defined - when: not result.stat.exists - rescue: - - name: Remove the unpacked RAR - file: - path: "{{ sap_bi_platform_unpack_base_directory }}/BISERVONE.tgz" - state: absent - when: sap_bi_platform_unpack_base_directory is defined diff --git a/ansible/roles/onr-web/tasks/post_installation_config.yml b/ansible/roles/onr-web/tasks/post_installation_config.yml deleted file mode 100644 index 0df573b5d..000000000 --- a/ansible/roles/onr-web/tasks/post_installation_config.yml +++ /dev/null @@ -1,69 +0,0 @@ -### TOMCAT POST INSTALLATION CONFIGURATION ---- -- name: Add tomcat config files - ansible.builtin.template: - src: "{{ item.src }}" - dest: "{{ tomcat_post_install_directories.tomcat }}/{{ item.dest }}" - loop: - - { src: "../templates/server.xml", dest: "conf/server.xml" } - - { src: "../templates/context.xml", dest: "conf/context.xml" } - - { src: "../templates/setenv.sh", dest: "bin/setenv.sh" } - -- name: Modify wdeploy.conf - ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_installation_directory }}/sap_bobj/enterprise_xi40/wdeploy/conf/wdeploy.conf" - regexp: "^disable_InfoView=" - line: "disable_InfoView=true" - become: true - become_user: bobj - -- name: Add custom properties config files - ansible.builtin.template: - src: "{{ item.src }}" - dest: "{{ tomcat_post_install_directories.custom_config }}/{{ item.dest }}" - loop: - - { src: "../templates/properties/BILogon.properties", dest: "BILogon.properties" } - - { src: "../templates/properties/CmcApp.properties", dest: "CmcApp.properties" } - - { src: "../templates/properties/FioriBI.properties", dest: "FioriBI.properties" } - - { src: "../templates/properties/global.properties", dest: "global.properties" } - - { src: "../templates/properties/OpenDocument.properties", dest: "OpenDocument.properties" } - - { src: "../templates/properties/PlatformServices.properties", dest: "PlatformServices.properties" } - -- name: Add biprws custom config file - ansible.builtin.template: - src: ../templates/properties/biprws.properties - dest: "{{ tomcat_post_install_directories.biprws_config }}/biprws.properties" - -- name: Rename main root files - block: - - name: Backup index file - ansible.builtin.copy: - remote_src: true - src: "{{ tomcat_post_install_directories.webapps_root }}/index.jsp" - dest: "{{ tomcat_post_install_directories.webapps_root }}/index_main.jsp" - - name: Check if BrowserCheck file exists - stat: - path: "{{ tomcat_post_install_directories.webapps_root }}/BrowserCheck.jsp" - register: browsercheck_file - - name: Backup BrowserCheck file - ansible.builtin.copy: - remote_src: true - src: "{{ tomcat_post_install_directories.webapps_root }}/BrowserCheck.jsp" - dest: "{{ tomcat_post_install_directories.webapps_root }}/BrowserCheck_Main.jsp" - when: browsercheck_file.stat.exists - become: true - become_user: bobj - -- name: Add root files - ansible.builtin.template: - src: "{{ item.src }}" - dest: "{{ tomcat_post_install_directories.webapps_root }}/{{ item.dest }}" - loop: - - { src: "../templates/root/BIlogoff.jsp", dest: "BIlogoff.jsp" } - - { src: "../templates/root/BrowserCheck.jsp", dest: "BrowserCheck.jsp" } - - { src: "../templates/root/BrowserCheck_Offline.jsp", dest: "BrowserCheck_Offline.jsp" } - - { src: "../templates/root/browsercheck.css", dest: "browsercheck.css" } - - { src: "../templates/root/browsercheck.js", dest: "browsercheck.js" } - - { src: "../templates/root/index.jsp", dest: "index.jsp" } - - { src: "../templates/root/keepalive.htm", dest: "keepalive.htm" } - - { src: "../templates/root/Unsupported_Browser.html", dest: "Unsupported_Browser.html" } diff --git a/ansible/roles/onr-web/tasks/retrieve_files.yml b/ansible/roles/onr-web/tasks/retrieve_files.yml deleted file mode 100644 index 96c1fa0b7..000000000 --- a/ansible/roles/onr-web/tasks/retrieve_files.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- -- name: Create directory to unpack BIP files - file: - path: "{{ sap_bi_platform_unpack_base_directory }}" - state: directory - mode: 0755 - -- name: Create directory to unpack JVM - file: - path: "{{ sap_jvm_unpack_base_directory }}" - state: directory - mode: 0755 - -# - name: Download JVM from S3 -# aws_s3: -# mode: get -# bucket: "{{ s3.bip_bucket_name }}" -# object: "{{ s3.prefix }}{{ item }}" -# dest: "{{ sap_jvm_unpack_base_directory }}/{{ item|basename }}" -# overwrite: true -# with_items: -# - "{{ s3.files.sap_jvm }}" -# - "{{ s3.files.sapcar }}" - -- name: Check if the BIPLATS4303P_300-70002683_P1.exe exists - stat: - path: "{{ sap_bi_platform_unpack_base_directory }}/BIPLATS4303P_300-70002683_P1.exe" - register: s3_result - -- name: Download BI Platform from S3 - block: - - name: Download BI files from S3 - aws_s3: - mode: get - bucket: "{{ s3.bip_bucket_name }}" - object: "{{ s3.packages_prefix }}{{ item }}" - dest: "{{ sap_bi_platform_unpack_base_directory }}/{{ item|basename }}" - overwrite: never - with_items: "{{ s3.files.sap_bi_platform }}" - - - name: Hacky rename - shell: | - for f in *; - do - e="${f##*.}"; - b="${f%.*}"; - mv -n "$f" "${b}.${e,,}"; - done - args: - chdir: "{{ sap_bi_platform_unpack_base_directory }}" - executable: /bin/bash - when: not s3_result.stat.exists diff --git a/ansible/roles/onr-web/templates/context.xml b/ansible/roles/onr-web/templates/context.xml deleted file mode 100644 index b2d75d12d..000000000 --- a/ansible/roles/onr-web/templates/context.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - WEB-INF/web.xml - WEB-INF/tomcat-web.xml - ${catalina.base}/conf/web.xml - - - - - - - - - - \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/properties/BILogon.properties b/ansible/roles/onr-web/templates/properties/BILogon.properties deleted file mode 100644 index ee71a00f5..000000000 --- a/ansible/roles/onr-web/templates/properties/BILogon.properties +++ /dev/null @@ -1,55 +0,0 @@ -# DO NOT MODIFY THIS FILE! -# To customize any of the settings, create a new file in \\warfiles\webapps\BOE\WEB-INF\config\custom -# and run wdeploy. Only changes in the custom directory will be maintained over patches. The new file has to have the same file name -# as this one and shall only contain the properties that you would like to customize. - - -# Application name -# These values are used in the place of the translated BI launch pad -# If not supplied they will default to a translated BI launch pad name -# app.name is used in most locations in the application. Optional -app.name=Prison-NOMIS Reporting -# app.name.short is used on the logon page. Optional -app.name.short=Prison-NOMIS Reporting -# Optional greeting not used in default application code -app.name.greeting=Welcome - -# app.custom.product.name is used on the logon page to display the Product Name (defaults to SAP BusinessObjects). Optional -app.custom.product.name=Prison-NOMIS - -# You can specify the default Authentication types here. secEnterprise, secLDAP, secWinAD, secSAPR3 -authentication.default=secEnterprise - -# Choose whether to let the user change the authentication type. If it isn't shown the default authentication type from above will be used -authentication.visible=false - -# You can specify the authentications that are supported in this field. -# By default all the authentications listed below will appear. You can add or remove values from the field, based on the authentications which are supported. -# Authentications List --- secEnterprise,secLDAP,secWinAD,secSAPR3,secOraApps,secPSE1,secpsenterprise,secSiebel7 -logon.authentication.visibleList=secEnterprise - -# You can specify the default CMS machine name here -cms.default=@nomis_t1 - -# Choose whether to let the user change the CMS name -cms.visible=false - -# Set to true to prompt when navigating away from a writable page in a modal dialog. Default is false -dialog.prompt.enabled=false - -#The URL that a logout will redirect to if the logon was an external logon (i.e. via start.do). This is optional. -url.exit=/BIlogoff.jsp - -# If the locale preference is disabled (only english languages will be used/allowed) -# TMC - disable.locale.preference needs to be set to false otherwise the locale is always US and therefore dates are displayed in US format regardless of the users viewing preferences. -disable.locale.preference=false - -#to enable notification polling -notification.enabled=true - -#You can specify the default administration email_ids in semicolon separated format here. -#The specified Email ids will be used when user will click on Contact Administrator on BILP Login screen -admin.user.email=NationalApplicationsReportingTeam@justice.gov.uk - -#Set a global flag for Disclaimer message -disclaimer.enabled=false \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/properties/CmcApp.properties b/ansible/roles/onr-web/templates/properties/CmcApp.properties deleted file mode 100644 index eb7306396..000000000 --- a/ansible/roles/onr-web/templates/properties/CmcApp.properties +++ /dev/null @@ -1,28 +0,0 @@ -# DO NOT MODIFY THIS FILE! -# To customize any of the settings, create a new file in \\warfiles\webapps\BOE\WEB-INF\config\custom -# and run wdeploy. Only changes in the custom directory will be maintained over patches. The new file has to have the same file name -# as this one and shall only contain the properties that you would like to customize. - - -# You can specify the default Authentication types here. secEnterprise, secLDAP, secWinAD, secSAPR3. -authentication.default=secEnterprise - -# Choose whether to let the user change the authentication type. If it isn't shown the default authentication type from above will be used. -authentication.visible=false - -# You can specify the authentications that are supported in this field. -# By default all the authentications listed below will appear. You can add or remove values from the field, based on the authentications which are supported. -# Authentications List --- secEnterprise,secLDAP,secWinAD,secSAPR3,secOraApps,secPSE1,secpsenterprise,secSiebel7 -logon.authentication.visibleList=secEnterprise - -# You can specify the default CMS machine name here -cms.default=@nomis_t1 - -# Choose whether to let the user change the CMS name. If it isn't shown the default System from above will be used -cms.visible=false - -# Set to true to prompt when navigating away from a writable page in a modal dialog. Default is false -dialog.prompt.enabled=false - -#set global flag for Disclaimer -disclaimer.enabled=false \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/properties/FioriBI.properties b/ansible/roles/onr-web/templates/properties/FioriBI.properties deleted file mode 100644 index 9a1ec2ddc..000000000 --- a/ansible/roles/onr-web/templates/properties/FioriBI.properties +++ /dev/null @@ -1,60 +0,0 @@ -# DO NOT MODIFY THIS FILE! -# To customize any of the settings, create a new file in \\warfiles\webapps\BOE\WEB-INF\config\custom -# and run wdeploy. Only changes in the custom directory will be maintained over patches. The new file has to have the same file name -# as this one and shall only contain the properties that you would like to customize. - - -# Application name -# These values are used in the place of the translated BI launch pad -# If not supplied they will default to a translated BI launch pad name -# app.name is used in most locations in the application. Optional -app.name=Prison-NOMIS Reporting -# app.name.short is used on the logon page. Optional -app.name.short=Prison-NOMIS Reporting -# Optional greeting not used in default application code -app.name.greeting=Welcome - -# app.custom.product.name is used on the logon page to display the Product Name (defaults to SAP BusinessObjects). Optional -app.custom.product.name=Prison-NOMIS - -# You can specify the default Authentication types here. secEnterprise, secLDAP, secWinAD, secSAPR3 -authentication.default=secEnterprise - -# Choose whether to let the user change the authentication type. If it isn't shown the default authentication type from above will be used -authentication.visible=false - -# You can specify the authentications that are supported in this field. -# By default all the authentications listed below will appear. You can add or remove values from the field, based on the authentications which are supported. -# Authentications List --- secEnterprise,secLDAP,secWinAD,secSAPR3,secOraApps,secPSE1,secpsenterprise,secSiebel7 -logon.authentication.visibleList=secEnterprise - -# You can specify the default CMS machine name here -cms.default=@nomis_t1 - -# Choose whether to let the user change the CMS name -cms.visible=false - -# Set to true to prompt when navigating away from a writable page in a modal dialog. Default is false -dialog.prompt.enabled=false - -#The URL that a logout will redirect to if the logon was an external logon (i.e. via start.do). This is optional. -url.exit=/BIlogoff.jsp - -# If the locale preference is disabled (only english languages will be used/allowed) -# TMC - disable.locale.preference needs to be set to false otherwise the locale is always US and therefore dates are displayed in US format regardless of the users viewing preferences. -disable.locale.preference=false - -#to enable notification polling. -notification.enabled=true -#to set notification polling time in milliseconds. Default is 200000 -notification.poling.time=200000 - -#You can specify the default administration email_ids in semicolon separated format here. -#The specified Email ids will be used when user will click on Contact Administrator on BILP Login screen -admin.user.email=NationalApplicationsReportingTeam@justice.gov.uk - -#Set global disclaimer flag -disclaimer.enabled=false - -# Set theme.enable to "custom" for enabling theming for Fiori BILaunchpad -theme.enable=custom \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/properties/OpenDocument.properties b/ansible/roles/onr-web/templates/properties/OpenDocument.properties deleted file mode 100644 index e556180ce..000000000 --- a/ansible/roles/onr-web/templates/properties/OpenDocument.properties +++ /dev/null @@ -1,36 +0,0 @@ -# DO NOT MODIFY THIS FILE! -# To customize any of the settings, create a new file in \\warfiles\webapps\BOE\WEB-INF\config\custom -# and run wdeploy. Only changes in the custom directory will be maintained over patches. The new file has to have the same file name -# as this one and shall only contain the properties that you would like to customize. - - -app.name=Prison-NOMIS Reporting OpenDocument -app.name.short=OpenDocument - -# app.custom.product.name is used on the logon page to display the Product Name (defaults to SAP BusinessObjects). Optional -app.custom.product.name=Prison-NOMIS - -# You can specify the default Authentication types here. secEnterprise, secLDAP, secWinAD, secSAPR3 -authentication.default=secEnterprise - -# Choose whether to let the user change the authentication type. If it isn't shown the default authentication type from above will be used -authentication.visible=false - -# You can specify the authentications that are supported in this field. -# By default all the authentications listed below will appear. You can add or remove values from the field, based on the authentications which are supported. -# Authentications List --- secEnterprise,secLDAP,secWinAD,secSAPR3,secOraApps,secPSE1,secpsenterprise,secSiebel7 -logon.authentication.visibleList=secEnterprise - - -# You can specify the default CMS machine name here -cms.default=@nomis_t1 - -# Choose whether to let the user change the CMS name. If it isn't shown the default System from above will be used -cms.visible=false - -#Set a global flag for disclaimer message -disclaimer.enabled=false - -#You can specify the default administration email_ids in semicolon separated format here. -#The specified Email ids will be used when user will click on Contact Administrator on Open Document Login screen -admin.user.email=NationalApplicationsReportingTeam@justice.gov.uk \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/properties/PlatformServices.properties b/ansible/roles/onr-web/templates/properties/PlatformServices.properties deleted file mode 100644 index 50fe34ca5..000000000 --- a/ansible/roles/onr-web/templates/properties/PlatformServices.properties +++ /dev/null @@ -1,13 +0,0 @@ -# DO NOT MODIFY THIS FILE! -# To customize any of the settings, create a new file in \\warfiles\webapps\BOE\WEB-INF\config\custom -# and run wdeploy. Only changes in the custom directory will be maintained over patches. The new file has to have the same file name -# as this one and shall only contain the properties that you would like to customize. - - -# cms.clusters: comma separated list of cluster names. Each cluster in the above list requires its own parameter: key = cms.clusters. (without the @), value = comma separated list of cms servers. Note: Each param-name must match case with the corresponding value in cms.clusters. No port needs to be given for a server. If none is given, then the default port 6400 is assumed. -#cms.clusters.samplecluster=cmsone:6400, cmstwo -#cms.clusters.samplecluster2=cms3, cms4, cms5 -#cms.clusters.samplecluster3=aps05 - -cms.clusters=@nomis_t1 -cms.clusters.nomis_t1=t1-ncr-cms \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/properties/biprws.properties b/ansible/roles/onr-web/templates/properties/biprws.properties deleted file mode 100644 index 3bcbaf8d7..000000000 --- a/ansible/roles/onr-web/templates/properties/biprws.properties +++ /dev/null @@ -1,29 +0,0 @@ -#------------------------------------------------------Default CMS Configuration------------------------------------------------------ -CMS_Default=@nomis_t1 -#------------------------------------------------------System Property Configuration------------------------------------------------------ -Default_Number_Of_Objects_On_One_Page=50 -Enterprise_Session_Token_Timeout_In_Minutes=60 -Session_Pool_Size=1000 -Session_Pool_Timeout_In_Minutes=2 -Basic_Auth_Supported=false -Basic_Auth_Type= -#------------------------------------------------------Logger properties------------------------------------------------------ -Log_Level=Medium -Log_Location= -Log_File_Size=20000 -Log_Files_Num=5 -#------------------------------------------------------Trusted Authentication Configuration------------------------------------------------------ -Retrieving_Method=HTTP_HEADER -User_Name_Parameter=X-SAP-TRUSTED-USER -Trusted_Auth_Shared_Secret= -# ------------------------------------------------------ SSO Related Default Global Core Web Properties ------------------------------------------------------ -# Vintela single sign on properties -sso.enabled=false -idm.realm= -idm.princ= -idm.keytab= -idm.allowUnsecured= -idm.allowNTLM= -idm.logger.name= -idm.logger.props= -idm.allowS4U= \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/properties/global.properties b/ansible/roles/onr-web/templates/properties/global.properties deleted file mode 100644 index bca2e1c2f..000000000 --- a/ansible/roles/onr-web/templates/properties/global.properties +++ /dev/null @@ -1,29 +0,0 @@ -# DO NOT MODIFY THIS FILE! -# To customize any of the settings, create a new file in \\warfiles\webapps\BOE\WEB-INF\config\custom -# and run wdeploy. Only changes in the custom directory will be maintained over patches. The new file has to have the same file name -# as this one and shall only contain the properties that you would like to customize. - - -# DEFAULT GLOBAL PROPERTIES -# -# This file contains DEFAULT global properties. A property defined here can have one of two scopes: -# -# Scope: global -# - It can be overridden at a global level by specifying a value in the CUSTOM global.properties file. -# -# Scope: application: -# - In addition to being overridable globally, it can also be on a per app basis. -# - This could happen in 1 of 2 ways: -# o It can be set in the app's CUSTOM config properties file. -# o Alternatively it could be set internally by the app, in which any custom value -# (either globally or for that application) is ignored. This would be indicated by comments in the -# application's DEFAULT properties file - - -# Configure whether "User list", "Group list" or "Group Hierarchy" should be selected (instead of "User list") in panels to select Users and UserGroups from -# Scope: global (CMC and BILP) -# Set to "userList" for "User list" to be default selection. -# Set to "groupList" for "Group list" to be default selection. -# Set to "groupHierarchy" for "Group Hierarchy" to be default selection -#prefer.root.selected=userList -prefer.root.selected=groupList \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/root/BIP_profile_icon.png b/ansible/roles/onr-web/templates/root/BIP_profile_icon.png deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible/roles/onr-web/templates/root/BIP_profile_menu_70pct.png b/ansible/roles/onr-web/templates/root/BIP_profile_menu_70pct.png deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible/roles/onr-web/templates/root/BIlogoff.jsp b/ansible/roles/onr-web/templates/root/BIlogoff.jsp deleted file mode 100644 index 12ade5f68..000000000 --- a/ansible/roles/onr-web/templates/root/BIlogoff.jsp +++ /dev/null @@ -1,17 +0,0 @@ -<%@ page session="false" language="java" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> - - - - - Prison-NOMIS Reporting - - - - -
-
- Please close this window and use the link in Prison-NOMIS to enter the reporting system. -
-
- - \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/root/BrowserCheck.jsp b/ansible/roles/onr-web/templates/root/BrowserCheck.jsp deleted file mode 100644 index b73bdb066..000000000 --- a/ansible/roles/onr-web/templates/root/BrowserCheck.jsp +++ /dev/null @@ -1,24 +0,0 @@ -<%@ page session="false" language="java" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> - - - - - Prison-NOMIS Reporting - - - - - - -
-
- Checking if your browser is supported by Prison-NOMIS Reporting... -
- -
- - \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/root/BrowserCheck_Offline.jsp b/ansible/roles/onr-web/templates/root/BrowserCheck_Offline.jsp deleted file mode 100644 index 9a2fb213d..000000000 --- a/ansible/roles/onr-web/templates/root/BrowserCheck_Offline.jsp +++ /dev/null @@ -1,17 +0,0 @@ -<%@ page session="false" language="java" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> - - - - - Prison-NOMIS Reporting - - - - -
-
- Prison-NOMIS Reporting is briefly unavailable for maintenance.

We apologise for the inconvenience, please try again shortly. -
-
- - \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/root/InfoView.ico b/ansible/roles/onr-web/templates/root/InfoView.ico deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible/roles/onr-web/templates/root/Unsupported_Browser.html b/ansible/roles/onr-web/templates/root/Unsupported_Browser.html deleted file mode 100644 index 5321dfff5..000000000 --- a/ansible/roles/onr-web/templates/root/Unsupported_Browser.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Prison-NOMIS Reporting - Unsupported Browser - - - - -
-
- Prison-NOMIS Reporting cannot load in Internet Explorer 8 as it is an unsupported browser.
MOJ Citrix Cloud Desktop within Quantum has a later version. -
-
- - \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/root/browsercheck.css b/ansible/roles/onr-web/templates/root/browsercheck.css deleted file mode 100644 index 707cb8a19..000000000 --- a/ansible/roles/onr-web/templates/root/browsercheck.css +++ /dev/null @@ -1,38 +0,0 @@ -html, -body -{ - margin: 0; - padding: 0; - height: 100%; - - font-family: Arial; - font-size: 1.0rem !important; - font-weight: bold; - color: #346187 !important; -} - -.BILP-launchpadbackground -{ - /* background-image: url("background.png"); */ - background-image: linear-gradient(to bottom,#a9c6de,#e7ecf0); - opacity: 1; - background-repeat: no-repeat; - background-position: center; - background-size: cover; - background-color: #BBD1E3 !important; - - height: 100%; -} - -.divCenter { - position: absolute; - /* height: 60px; - width: 600px; */ - /* z-index:15; */ - top: 50%; - left: 50%; - margin: -30px 0 0 -300px; - - vertical-align: middle; - text-align: center; -} \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/root/browsercheck.js b/ansible/roles/onr-web/templates/root/browsercheck.js deleted file mode 100644 index ab2126777..000000000 --- a/ansible/roles/onr-web/templates/root/browsercheck.js +++ /dev/null @@ -1,33 +0,0 @@ -function init() { - var isIELessThan11 = (navigator.userAgent.indexOf("MSIE") >= 0); - if (isIELessThan11) { - window.location.href = '/Unsupported_Browser.html'; - } - else { - document.getElementById("checking").style.display = "none"; - document.getElementById("supported").style.display = "inline"; - - var BIPURL = '/BOE/BI/logon/start.do?ivsLogonToken='; - var URL = window.location.href; - var qs = getParameterByName('t', URL); - - if (!qs || qs.length === 0) { - window.location.href = '/BIlogoff.jsp'; - } else { - //BIPURL = BIPURL + qs; - BIPURL = BIPURL + encodeURIComponent(qs); - window.location.href = BIPURL; - } - } - - window.focus(); -} - -function getParameterByName(name, url) { - name = name.replace(/[\[\]]/g, '\\$&'); - var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'), - results = regex.exec(url); - if (!results) return null; - if (!results[2]) return ''; - return decodeURIComponent(results[2].replace(/\+/g, ' ')); -} \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/root/index.jsp b/ansible/roles/onr-web/templates/root/index.jsp deleted file mode 100644 index 050702d99..000000000 --- a/ansible/roles/onr-web/templates/root/index.jsp +++ /dev/null @@ -1,11 +0,0 @@ -<%@ page session="false" language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - - - - -Prison-NOMIS Reporting - - - - - \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/root/keepalive.htm b/ansible/roles/onr-web/templates/root/keepalive.htm deleted file mode 100644 index 93adabc3e..000000000 --- a/ansible/roles/onr-web/templates/root/keepalive.htm +++ /dev/null @@ -1,6 +0,0 @@ - - -Keepalive - NOMIS Reporting - -Keepalive - NOMIS Reporting - \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/server.xml b/ansible/roles/onr-web/templates/server.xml deleted file mode 100644 index 25288363d..000000000 --- a/ansible/roles/onr-web/templates/server.xml +++ /dev/null @@ -1,157 +0,0 @@ -?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/setenv.sh b/ansible/roles/onr-web/templates/setenv.sh deleted file mode 100644 index 3df84fbc1..000000000 --- a/ansible/roles/onr-web/templates/setenv.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# Do not remove the line 'source bobjenv.sh' as it is required by the SAP installer and applications. -. ./bobjenv.sh -# START USERCONFIG - Enter your user config settings to be retained here -JAVA_OPTS="$JAVA_OPTS -Xmx4096m -XX:MaxMetaspaceSize=1024m" - -# END USERCONFIG \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh b/ansible/roles/onr-web/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh deleted file mode 100644 index d700e64ce..000000000 --- a/ansible/roles/onr-web/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# This file copies the rc files and creates the proper symlinks. -# This can only be done by root. - -USERNAME=`id | sed -e "s|).*\$||" -e "s|^.*(||" ` -if [ "$USERNAME" != "root" ]; then - echo "Log in as root and run in order to set up the init scripts. (STU00136)" - exit 0 -fi - -errorExit() -{ - echo $1 - exit 1 -} - -chown root "/u01/app/bobj/BIP4/sap_bobj/init/SAPBOBJEnterpriseXI40" || errorExit "System initialization scripts failed. (STU00131)" - -SOFTWARE=`uname -s` -case X"$SOFTWARE" in -XSunOS) - if [ -f "/etc/init.d/SAPBOBJEnterpriseXI40" ]; then - rm -rf "/etc/init.d/SAPBOBJEnterpriseXI40" - mv -f "/u01/app/bobj/BIP4/sap_bobj//init/SAPBOBJEnterpriseXI40" "/etc/init.d/SAPBOBJEnterpriseXI40" || errorExit "System initialization scripts failed. (STU00131)" - exit 0 - fi - - mv -f "/u01/app/bobj/BIP4/sap_bobj//init/SAPBOBJEnterpriseXI40" "/etc/init.d/SAPBOBJEnterpriseXI40" || errorExit "System initialization scripts failed. (STU00131)" - cd /etc/init.d || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc3.d/S99SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc1.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc0.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" -;; -XLinux) - if [ -f "/etc/init.d/SAPBOBJEnterpriseXI40" ]; then - rm -rf "/etc/init.d/SAPBOBJEnterpriseXI40" - mv -f "/u01/app/bobj/BIP4/sap_bobj//init/SAPBOBJEnterpriseXI40" "/etc/init.d/SAPBOBJEnterpriseXI40" || errorExit "System initialization scripts failed. (STU00131)" - exit 0 - fi - - mv -f "/u01/app/bobj/BIP4/sap_bobj//init/SAPBOBJEnterpriseXI40" "/etc/init.d/SAPBOBJEnterpriseXI40" || errorExit "System initialization scripts failed. (STU00131)" - cd /etc/init.d || errorExit "System initialization scripts failed. (STU00131)" - if [ -f "/etc/redhat-release" ]; then - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc0.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc1.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc2.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc3.d/S99SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc4.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc5.d/S99SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ../rc6.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - else - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ./rc3.d/S99SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ./rc5.d/S99SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ./rc3.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /etc/init.d/SAPBOBJEnterpriseXI40 ./rc5.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - insserv -v SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - fi - -;; -XAIX) - if [ -f "/etc/SAPBOBJEnterpriseXI40" ]; then - rm -rf "/etc/init.d/SAPBOBJEnterpriseXI40" - mv -f "/u01/app/bobj/BIP4/sap_bobj/init/SAPBOBJEnterpriseXI40" "/etc/SAPBOBJEnterpriseXI40" - exit 0 - fi - - mkdir -p /etc/SAPBOBJEnterpriseXI40 - mv -f "/u01/app/bobj/BIP4/sap_bobj/init/SAPBOBJEnterpriseXI40" "/etc/SAPBOBJEnterpriseXI40" - if ! grep BobjE140 /etc/inittab >/dev/null; then - echo "BobjE140:2:once:/etc/SAPBOBJEnterpriseXI40/SAPBOBJEnterpriseXI40 start > /dev/null 2>&1" >> /etc/inittab - fi - if [ ! -f "/etc/rc.shutdown" ]; then - echo "#!/bin/sh" >> /etc/rc.shutdown - chmod 755 /etc/rc.shutdown - fi - if ! grep SAPBOBJEnterpriseXI40 /etc/rc.shutdown >/dev/null; then - echo "/etc/SAPBOBJEnterpriseXI40/SAPBOBJEnterpriseXI40 stop > /dev/null 2>&1" >> /etc/rc.shutdown - fi -;; -XHP-UX) - if [ -f "/sbin/init.d/SAPBOBJEnterpriseXI40" ]; then - rm -rf "/sbin/init.d/SAPBOBJEnterpriseXI40" - mv -f "/u01/app/bobj/BIP4/sap_bobj//init/SAPBOBJEnterpriseXI40" "/sbin/init.d/SAPBOBJEnterpriseXI40" || errorExit "System initialization scripts failed. (STU00131)" - exit 0 - fi - - mv -f "/u01/app/bobj/BIP4/sap_bobj//init/SAPBOBJEnterpriseXI40" "/sbin/init.d/SAPBOBJEnterpriseXI40" || errorExit "System initialization scripts failed. (STU00131)" - cd /sbin/init.d || errorExit "System initialization scripts failed. (STU00131)" - - SNUM=99 - if [ `uname -m` = "ia64" ]; then - SNUM=901 - while [ "" != "`ls /sbin/rc2.d | grep ^S$SNUM`" -a $SNUM -lt 999 ]; do - SNUM=`expr $SNUM + 1` # increment counter - done - fi - - ln -s /sbin/init.d/SAPBOBJEnterpriseXI40 ../rc2.d/S"$SNUM"SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /sbin/init.d/SAPBOBJEnterpriseXI40 ../rc1.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" - ln -s /sbin/init.d/SAPBOBJEnterpriseXI40 ../rc0.d/K01SAPBOBJEnterpriseXI40 || errorExit "System initialization scripts failed. (STU00131)" -;; -esac - -echo "System initialization scripts created." - -# EOF \ No newline at end of file diff --git a/ansible/roles/onr-web/templates/wdeploy.conf b/ansible/roles/onr-web/templates/wdeploy.conf deleted file mode 100644 index 3d4e07a27..000000000 --- a/ansible/roles/onr-web/templates/wdeploy.conf +++ /dev/null @@ -1,29 +0,0 @@ -## -## Business Objects Configuration Utility for WDeploy -## - -# Lang: The language setting for WDeploy UI Preferential order for WDeploy UI to load language setting -as_lang=en - -# work_dir: To store the deployable war files/static resources generated by the WDeploy predeploy/predeployall command -work_dir= - -# war_dir: Generic war file location (Ensure all the generic war files are in the same location) -war_dir= - -# app_source_tree: Global parameter for all web application source tree (Ensure all the web applications source tree folders are in the same location) -app_source_tree= - -# To Enable/Disable CMC or InfoView(BI Launch Pad) web application -disable_CmcApp=false -disable_InfoView=true - -# This parameter is used to include or exclude JCO related libraries for SAP and Non-SAP web application server deployment -# Default value is blank. -JCoStandalone= - -# root_context_path: The root context path on web application server to deploy to. -root_context_path= - -# recent_app_svr: the most recent app server that used to deploy BO web apps. -recent_app_svr=Tomcat 9.0 \ No newline at end of file From 9dd7769953b5d29b4afd2ec358b6a10d2b3ae856 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Wed, 29 May 2024 09:19:53 +0100 Subject: [PATCH 11/16] change users and groups vars --- ansible/group_vars/server_type_onr_web.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/server_type_onr_web.yml b/ansible/group_vars/server_type_onr_web.yml index b7c00eec1..77cd0cd05 100644 --- a/ansible/group_vars/server_type_onr_web.yml +++ b/ansible/group_vars/server_type_onr_web.yml @@ -3,15 +3,23 @@ ansible_python_interpreter: /usr/bin/python3.9 # TODO: Users and Disks roles need checking versus what we're actually deploying -# TODO: implement the same users/groups values as in onr-boe basically +# NOTE: test environment uses different values from production and preproduction, defaults are 502 and 501 for group dba and user oracle. For some reason 't2' uses 503 and 502. users_and_groups_system: + - group: dba + gid: "{{ (ec2.tags['environment-name'] == 'oasys-national-reporting-test') | ternary('503', '502') }}" + - group: wheel + gid: 10 + - group: oinstall + gid: "{{ (ec2.tags['environment-name'] == 'oasys-national-reporting-test') | ternary('502', '501') }}" - name: oracle group: oinstall + uid: "{{ (ec2.tags['environment-name'] == 'oasys-national-reporting-test') | ternary('502', '501') }}" groups: - dba - wheel - name: bobj group: binstall + uid: 1201 groups: - dba - sapsys From ef34f641dd2b11c2f8bc4f0073dd265c77083f67 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Wed, 29 May 2024 11:39:23 +0100 Subject: [PATCH 12/16] change users, groups and disks vars --- ansible/group_vars/server_type_onr_web.yml | 29 ++++------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/ansible/group_vars/server_type_onr_web.yml b/ansible/group_vars/server_type_onr_web.yml index 77cd0cd05..33ea3689f 100644 --- a/ansible/group_vars/server_type_onr_web.yml +++ b/ansible/group_vars/server_type_onr_web.yml @@ -1,28 +1,12 @@ --- ansible_python_interpreter: /usr/bin/python3.9 -# TODO: Users and Disks roles need checking versus what we're actually deploying - -# NOTE: test environment uses different values from production and preproduction, defaults are 502 and 501 for group dba and user oracle. For some reason 't2' uses 503 and 502. users_and_groups_system: - - group: dba - gid: "{{ (ec2.tags['environment-name'] == 'oasys-national-reporting-test') | ternary('503', '502') }}" - - group: wheel - gid: 10 - - group: oinstall - gid: "{{ (ec2.tags['environment-name'] == 'oasys-national-reporting-test') | ternary('502', '501') }}" - - name: oracle - group: oinstall - uid: "{{ (ec2.tags['environment-name'] == 'oasys-national-reporting-test') | ternary('502', '501') }}" - groups: - - dba - - wheel - - name: bobj - group: binstall - uid: 1201 - groups: - - dba - - sapsys + - group: tomcat + gid: 91 + - name: tomcat + group: tomcat + uid: 91 server_type_roles_list: - sshd-config @@ -87,6 +71,3 @@ disks_mount: - ebs_device_name: /dev/sdc dir: /u02 fstype: xfs - - ebs_device_name: /dev/sds - dir: swap - fstype: swap From 37c475e7079a915047abdbb7a2b53dae85967098 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Wed, 29 May 2024 11:56:16 +0100 Subject: [PATCH 13/16] rename files --- ansible/group_vars/server_type_onr_web.yml | 12 +++-- ansible/roles/onr-web/defaults/main.yml | 13 +++--- .../onr-web/tasks/assign_permissions.yml | 1 + .../{add_groups.yml => check-groups.yml} | 9 +--- .../tasks/{get_facts.yml => get-facts.yml} | 2 +- ...tall_packages.yml => install-packages.yml} | 0 ...{install_tomcat.yml => install-tomcat.yml} | 0 ansible/roles/onr-web/tasks/main.yml | 45 +++++-------------- ...se_file.yml => template-response-file.yml} | 2 + 9 files changed, 32 insertions(+), 52 deletions(-) rename ansible/roles/onr-web/tasks/{add_groups.yml => check-groups.yml} (61%) rename ansible/roles/onr-web/tasks/{get_facts.yml => get-facts.yml} (76%) rename ansible/roles/onr-web/tasks/{install_packages.yml => install-packages.yml} (100%) rename ansible/roles/onr-web/tasks/{install_tomcat.yml => install-tomcat.yml} (100%) rename ansible/roles/onr-web/tasks/{add_response_file.yml => template-response-file.yml} (95%) diff --git a/ansible/group_vars/server_type_onr_web.yml b/ansible/group_vars/server_type_onr_web.yml index 33ea3689f..74ccc25cb 100644 --- a/ansible/group_vars/server_type_onr_web.yml +++ b/ansible/group_vars/server_type_onr_web.yml @@ -2,12 +2,18 @@ ansible_python_interpreter: /usr/bin/python3.9 users_and_groups_system: - - group: tomcat - gid: 91 + - group: dba + gid: "{{ (ec2.tags['environment-name'] == 'oasys-national-reporting-test') | ternary('503', '502') }}" - name: tomcat group: tomcat uid: 91 - + - name: bobj + group: binstall + uid: 1201 + groups: + - dba + - sapsys + server_type_roles_list: - sshd-config - users-and-groups diff --git a/ansible/roles/onr-web/defaults/main.yml b/ansible/roles/onr-web/defaults/main.yml index 5a41e4920..f7e527ccb 100644 --- a/ansible/roles/onr-web/defaults/main.yml +++ b/ansible/roles/onr-web/defaults/main.yml @@ -11,13 +11,12 @@ boe_install_group: binstall stage: "{{ artefact_dir }}/stage" temp: "{{ artefact_dir }}/temp" -# onr_environment: "{{ ec2.tags['environment-name'] | regex_replace('^oasys-national-reporting-', '') }}" +tomcat_admin_secretsmanager_passwords: + tomcat_admin: + secret: "/ec2/onr-web/{{ onr_environment }}/passwords" + users: + - tomcat_admin: auto + # cms_name: "{{ ncr_environment }}-ncr-cms" # ssm_parameters_prefix: "tomcat" - -# tomcat_admin_secretsmanager_passwords: -# tomcat_admin: -# secret: "/ec2/onr-web/{{ onr_environment }}/passwords" -# users: -# - tomcat_admin: auto diff --git a/ansible/roles/onr-web/tasks/assign_permissions.yml b/ansible/roles/onr-web/tasks/assign_permissions.yml index e5cd247e1..5a83b4378 100644 --- a/ansible/roles/onr-web/tasks/assign_permissions.yml +++ b/ansible/roles/onr-web/tasks/assign_permissions.yml @@ -1,4 +1,5 @@ --- +# TODO: check whether we need this and change to assing-permissions.yml and reference correctly in tasks/main.yml - name: Assign bobj permissions ansible.builtin.file: path: "{{ item }}" diff --git a/ansible/roles/onr-web/tasks/add_groups.yml b/ansible/roles/onr-web/tasks/check-groups.yml similarity index 61% rename from ansible/roles/onr-web/tasks/add_groups.yml rename to ansible/roles/onr-web/tasks/check-groups.yml index d4a303c9b..233e73862 100644 --- a/ansible/roles/onr-web/tasks/add_groups.yml +++ b/ansible/roles/onr-web/tasks/check-groups.yml @@ -4,17 +4,12 @@ name: binstall state: present -- name: Ensure oinstall group exists - ansible.builtin.group: - name: oinstall - state: present - - name: Ensure dba group exists ansible.builtin.group: name: dba state: present -- name: Ensure sapsys group exists +- name: Ensure tomcat group exists ansible.builtin.group: - name: sapsys + name: tomcat state: present diff --git a/ansible/roles/onr-web/tasks/get_facts.yml b/ansible/roles/onr-web/tasks/get-facts.yml similarity index 76% rename from ansible/roles/onr-web/tasks/get_facts.yml rename to ansible/roles/onr-web/tasks/get-facts.yml index 206e7e7a7..2b4a953c4 100644 --- a/ansible/roles/onr-web/tasks/get_facts.yml +++ b/ansible/roles/onr-web/tasks/get-facts.yml @@ -8,4 +8,4 @@ - name: Set password facts set_fact: cms_admin_password: "{{ secretsmanager_passwords_dict['tomcat_admin'].passwords['cms_admin_password'] }}" - product_key: "{{ secretsmanager_passwords_dict['tomcat_admin'].passwords['product_key'] }}" + # product_key: "{{ secretsmanager_passwords_dict['tomcat_admin'].passwords['product_key'] }}" diff --git a/ansible/roles/onr-web/tasks/install_packages.yml b/ansible/roles/onr-web/tasks/install-packages.yml similarity index 100% rename from ansible/roles/onr-web/tasks/install_packages.yml rename to ansible/roles/onr-web/tasks/install-packages.yml diff --git a/ansible/roles/onr-web/tasks/install_tomcat.yml b/ansible/roles/onr-web/tasks/install-tomcat.yml similarity index 100% rename from ansible/roles/onr-web/tasks/install_tomcat.yml rename to ansible/roles/onr-web/tasks/install-tomcat.yml diff --git a/ansible/roles/onr-web/tasks/main.yml b/ansible/roles/onr-web/tasks/main.yml index c7592e97c..b5f601a06 100644 --- a/ansible/roles/onr-web/tasks/main.yml +++ b/ansible/roles/onr-web/tasks/main.yml @@ -1,39 +1,21 @@ --- -- import_tasks: get_facts.yml +- import_tasks: get-facts.yml tags: - amibuild - ec2provision when: ansible_distribution in ['RedHat'] -# - import_tasks: install_packages.yml -# tags: -# - amibuild -# - ec2provision -# when: ansible_distribution in ['RedHat'] - -# - import_tasks: add_groups.yml -# tags: -# - amibuild -# - ec2provision -# when: ansible_distribution in ['RedHat'] - -# - import_tasks: assign_permissions.yml -# tags: -# - amibuild -# - ec2provision -# when: ansible_distribution in ['RedHat'] - -# - import_tasks: retrieve_files.yml -# tags: -# - amibuild -# - ec2provision -# when: ansible_distribution in ['RedHat'] +- import_tasks: install-packages.yml + tags: + - amibuild + - ec2provision + when: ansible_distribution in ['RedHat'] -# - import_tasks: extract_files.yml -# tags: -# - amibuild -# - ec2provision -# when: ansible_distribution in ['RedHat'] +- import_tasks: check-groups.yml + tags: + - amibuild + - ec2provision + when: ansible_distribution in ['RedHat'] - import_role: name: onr-get @@ -54,8 +36,3 @@ # - ec2provision # when: ansible_distribution in ['RedHat'] -# - import_tasks: post_installation_config.yml -# tags: -# - amibuild -# - ec2provision -# when: ansible_distribution in ['RedHat'] diff --git a/ansible/roles/onr-web/tasks/add_response_file.yml b/ansible/roles/onr-web/tasks/template-response-file.yml similarity index 95% rename from ansible/roles/onr-web/tasks/add_response_file.yml rename to ansible/roles/onr-web/tasks/template-response-file.yml index 3e74ca43a..ae041ac84 100644 --- a/ansible/roles/onr-web/tasks/add_response_file.yml +++ b/ansible/roles/onr-web/tasks/template-response-file.yml @@ -1,3 +1,5 @@ +--- +# TODO: fix this and rename file in tasks/main.yml - name: Copy pre requesites file ansible.builtin.template: src: u02/software/BIP_4_3_SP1/prereq_checks.ini From f2d7d6a623f4042206e19574181e7cf7f02e2a93 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Wed, 29 May 2024 13:47:34 +0100 Subject: [PATCH 14/16] change password var --- ansible/roles/onr-web/tasks/get-facts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/onr-web/tasks/get-facts.yml b/ansible/roles/onr-web/tasks/get-facts.yml index 2b4a953c4..d10241d4a 100644 --- a/ansible/roles/onr-web/tasks/get-facts.yml +++ b/ansible/roles/onr-web/tasks/get-facts.yml @@ -7,5 +7,5 @@ - name: Set password facts set_fact: - cms_admin_password: "{{ secretsmanager_passwords_dict['tomcat_admin'].passwords['cms_admin_password'] }}" + cms_admin_password: "{{ secretsmanager_passwords_dict['tomcat_admin'].passwords['tomcat_admin'] }}" # product_key: "{{ secretsmanager_passwords_dict['tomcat_admin'].passwords['product_key'] }}" From 9b8a89cf5219c8e278a40b7e668a6d8ea4b4eba2 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Wed, 29 May 2024 15:07:00 +0100 Subject: [PATCH 15/16] remove packages step as they're not available --- ansible/roles/onr-web/tasks/main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ansible/roles/onr-web/tasks/main.yml b/ansible/roles/onr-web/tasks/main.yml index b5f601a06..cd8a472e9 100644 --- a/ansible/roles/onr-web/tasks/main.yml +++ b/ansible/roles/onr-web/tasks/main.yml @@ -5,11 +5,12 @@ - ec2provision when: ansible_distribution in ['RedHat'] -- import_tasks: install-packages.yml - tags: - - amibuild - - ec2provision - when: ansible_distribution in ['RedHat'] +# NOTE: none of this seems to be needed - packages referenced here are not available in the yum repos +# - import_tasks: install-packages.yml +# tags: +# - amibuild +# - ec2provision +# when: ansible_distribution in ['RedHat'] - import_tasks: check-groups.yml tags: From 60e9fb31d251f38abaf6c88082aea0fdccefd223 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 29 May 2024 14:50:37 +0000 Subject: [PATCH 16/16] Commit changes made by code formatters --- ansible/group_vars/server_type_onr_web.yml | 4 ++-- ansible/roles/onr-web/defaults/main.yml | 1 - ansible/roles/onr-web/tasks/main.yml | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ansible/group_vars/server_type_onr_web.yml b/ansible/group_vars/server_type_onr_web.yml index 74ccc25cb..0a859732d 100644 --- a/ansible/group_vars/server_type_onr_web.yml +++ b/ansible/group_vars/server_type_onr_web.yml @@ -13,7 +13,7 @@ users_and_groups_system: groups: - dba - sapsys - + server_type_roles_list: - sshd-config - users-and-groups @@ -33,7 +33,7 @@ server_type_roles_list: - disks - onr-web # TODO: comment these back in later - # - collectd + # - collectd # - amazon-cloudwatch-agent # - amazon-cloudwatch-agent-collectd # - collectd-service-metrics diff --git a/ansible/roles/onr-web/defaults/main.yml b/ansible/roles/onr-web/defaults/main.yml index f7e527ccb..0b82a68bb 100644 --- a/ansible/roles/onr-web/defaults/main.yml +++ b/ansible/roles/onr-web/defaults/main.yml @@ -16,7 +16,6 @@ tomcat_admin_secretsmanager_passwords: secret: "/ec2/onr-web/{{ onr_environment }}/passwords" users: - tomcat_admin: auto - # cms_name: "{{ ncr_environment }}-ncr-cms" # ssm_parameters_prefix: "tomcat" diff --git a/ansible/roles/onr-web/tasks/main.yml b/ansible/roles/onr-web/tasks/main.yml index cd8a472e9..f76652ea1 100644 --- a/ansible/roles/onr-web/tasks/main.yml +++ b/ansible/roles/onr-web/tasks/main.yml @@ -24,7 +24,6 @@ - amibuild - ec2provision when: ansible_distribution in ['RedHat'] - # - import_tasks: add_response_file.yml # tags: # - amibuild