diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 5b1a2a0..76ae204 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -1,6 +1,7 @@ --- # Payara user and admin user's password payara_user: "glassfish" +payara_user_group: "{{ payara_user }}" payara_admin_password: "{{ vault_payara_admin_password }}" # Database root user's username and password diff --git a/roles/authn_anon/tasks/main.yml b/roles/authn_anon/tasks/main.yml index 208f29e..6e333fb 100644 --- a/roles/authn_anon/tasks/main.yml +++ b/roles/authn_anon/tasks/main.yml @@ -14,7 +14,7 @@ extension: "zip" dest: "/home/{{ payara_user }}/downloads/authn.anon-{{ authn_anon_version }}-distro.zip" owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" when: ansible_local.local.instantiations.authn_anon is not defined or ansible_local.local.versions.authn_anon != authn_anon_version - name: "Find any war files not matching the current version" @@ -45,7 +45,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/install/authn.anon/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 notify: - "authn_anon-handler" @@ -60,7 +60,7 @@ src: file/run.properties dest: /home/{{ payara_user }}/install/authn.anon/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -71,7 +71,7 @@ src: templates/run.properties.j2 dest: /home/{{ payara_user }}/install/authn.anon/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -82,7 +82,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/authn.anon/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "authn_anon-handler" diff --git a/roles/authn_db/tasks/main.yml b/roles/authn_db/tasks/main.yml index 19b1736..898853b 100644 --- a/roles/authn_db/tasks/main.yml +++ b/roles/authn_db/tasks/main.yml @@ -14,7 +14,7 @@ extension: "zip" dest: "/home/{{ payara_user }}/downloads/authn.db-{{ authn_db_version }}-distro.zip" owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' when: ansible_local.local.instantiations.authn_db is not defined or ansible_local.local.versions.authn_db != authn_db_version - name: "Find any war files not matching the current version" @@ -50,7 +50,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/authn.db/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -61,7 +61,7 @@ src: templates/mariadb.setup.properties.j2 dest: /home/{{ payara_user }}/install/authn.db/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false and (ansible_local.local.instantiations.mariadb is defined and ansible_local.local.instantiations.mariadb == 'true') notify: @@ -72,7 +72,7 @@ src: templates/oracle.setup.properties.j2 dest: /home/{{ payara_user }}/install/authn.db/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false and (ansible_local.local.instantiations.mariadb is not defined or ansible_local.local.instantiations.mariadb == 'false') notify: @@ -88,7 +88,7 @@ src: files/run.properties dest: /home/{{ payara_user }}/install/authn.db/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -99,7 +99,7 @@ src: templates/run.properties.j2 dest: /home/{{ payara_user }}/install/authn.db/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -110,7 +110,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/authn.db/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "authn_db-handler" diff --git a/roles/authn_ip_clf/tasks/main.yml b/roles/authn_ip_clf/tasks/main.yml index c423afb..4bbaf6d 100644 --- a/roles/authn_ip_clf/tasks/main.yml +++ b/roles/authn_ip_clf/tasks/main.yml @@ -9,7 +9,7 @@ url: http://nexus.esc.rl.ac.uk:8081/nexus/service/local/repositories/releases/content/uk/ac/rl/scd/authn.ip_clf/{{ authn_ip_clf_version }}/authn.ip_clf-{{ authn_ip_clf_version }}-distro.zip dest: /home/{{ payara_user }}/downloads owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" when: installationResult.stat.exists is defined and installationResult.stat.exists == false - name: "Check authn_ip_clf-setup.properties file existence" @@ -37,7 +37,7 @@ src: files/authn_ip_clf-setup.properties dest: /home/{{ payara_user }}/install/authn.ip_clf/authn_ip_clf-setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -48,7 +48,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/install/authn.ip_clf/authn_ip_clf-setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false notify: @@ -64,7 +64,7 @@ src: files/authn_ip_clf.properties dest: /home/{{ payara_user }}/install/authn.ip_clf/authn_ip_clf.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -75,7 +75,7 @@ src: templates/authn_ip_clf.properties.j2 dest: /home/{{ payara_user }}/install/authn.ip_clf/authn_ip_clf.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -86,7 +86,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/authn.ip_clf/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "authn_ip_clf-handler" diff --git a/roles/authn_ldap/tasks/main.yml b/roles/authn_ldap/tasks/main.yml index fb172ce..cc2d688 100644 --- a/roles/authn_ldap/tasks/main.yml +++ b/roles/authn_ldap/tasks/main.yml @@ -14,7 +14,7 @@ extension: "zip" dest: "/home/{{ payara_user }}/downloads/authn.ldap-{{ authn_ldap_version }}-distro.zip" owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" when: ansible_local.local.instantiations.authn_ldap is not defined or ansible_local.local.versions.authn_ldap != authn_ldap_version - name: "Find any war files not matching the current version" @@ -50,7 +50,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/authn.ldap/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -61,7 +61,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/install/authn.ldap/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false notify: @@ -77,7 +77,7 @@ src: file/run.properties dest: /home/{{ payara_user }}/install/authn.ldap/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -88,7 +88,7 @@ src: templates/run.properties.j2 dest: /home/{{ payara_user }}/install/authn.ldap/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -99,7 +99,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/authn.ldap/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "authn_ldap-handler" diff --git a/roles/authn_simple/tasks/main.yml b/roles/authn_simple/tasks/main.yml index 1ae2efa..8ade308 100644 --- a/roles/authn_simple/tasks/main.yml +++ b/roles/authn_simple/tasks/main.yml @@ -14,7 +14,7 @@ extension: "zip" dest: "/home/{{ payara_user }}/downloads/authn.simple-{{ authn_simple_version }}-distro.zip" owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' when: ansible_local.local.instantiations.authn_simple is not defined or ansible_local.local.versions.authn_simple != authn_simple_version - name: "Find any war files not matching the current version" @@ -50,7 +50,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/authn.simple/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -61,7 +61,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/install/authn.simple/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false notify: @@ -77,7 +77,7 @@ src: files/run.properties dest: /home/{{ payara_user }}/install/authn.simple/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -88,7 +88,7 @@ src: templates/run.properties.j2 dest: /home/{{ payara_user }}/install/authn.simple/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -99,7 +99,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/authn.simple/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "authn_simple-handler" diff --git a/roles/authn_uows_clf/tasks/main.yml b/roles/authn_uows_clf/tasks/main.yml index b69c6a1..5be5b56 100644 --- a/roles/authn_uows_clf/tasks/main.yml +++ b/roles/authn_uows_clf/tasks/main.yml @@ -10,7 +10,7 @@ url: http://nexus.esc.rl.ac.uk:8081/nexus/service/local/repositories/releases/content/uk/ac/rl/scd/authn.uows_clf/{{ authn_uows_clf_version }}/authn.uows_clf-{{ authn_uows_clf_version }}-distro.zip dest: /home/{{ payara_user }}/downloads owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -25,7 +25,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" when: installationResult.stat.exists is defined and installationResult.stat.exists == false - name: "Check authn_uows_clf-setup.properties file existence" @@ -38,7 +38,7 @@ src: files/authn_uows_clf-setup.properties dest: /home/{{ payara_user }}/install/authn.uows_clf/authn_uows_clf-setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -49,7 +49,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/install/authn.uows_clf/authn_uows_clf-setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false notify: @@ -65,7 +65,7 @@ src: files/authn_uows_clf.properties dest: /home/{{ payara_user }}/install/authn.uows_clf/authn_uows_clf.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -76,7 +76,7 @@ src: templates/authn_uows_clf.properties.j2 dest: /home/{{ payara_user }}/install/authn.uows_clf/authn_uows_clf.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -87,7 +87,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/authn.uows_clf/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "authn_uows_clf-handler" diff --git a/roles/authn_uows_isis/tasks/main.yml b/roles/authn_uows_isis/tasks/main.yml index b03b6d4..3642d9f 100644 --- a/roles/authn_uows_isis/tasks/main.yml +++ b/roles/authn_uows_isis/tasks/main.yml @@ -9,7 +9,7 @@ url: http://nexus.esc.rl.ac.uk:8081/nexus/service/local/repositories/releases/content/org/icatproject/authn.uows/{{ authn_uows_version }}/authn.uows-{{ authn_uows_version }}-distro.zip dest: /home/{{ payara_user }}/downloads owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" when: installationResult.stat.exists is defined and installationResult.stat.exists == false - name: "Check setup.properties file existence" @@ -37,7 +37,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/authn.uows/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -48,7 +48,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/install/authn.uows/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false notify: @@ -64,7 +64,7 @@ src: files/run.properties dest: /home/{{ payara_user }}/install/authn.uows/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -75,7 +75,7 @@ src: templates/run.properties.j2 dest: /home/{{ payara_user }}/install/authn.uows/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -86,7 +86,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/authn.uows/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "authn_uows-handler" diff --git a/roles/datagateway_download_api/tasks/create-setup-properties.yml b/roles/datagateway_download_api/tasks/create-setup-properties.yml index 8f37a58..f6546cc 100644 --- a/roles/datagateway_download_api/tasks/create-setup-properties.yml +++ b/roles/datagateway_download_api/tasks/create-setup-properties.yml @@ -4,7 +4,7 @@ path: /home/{{ payara_user }}/stash state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Create a stash directory for datagateway-download-api configs" @@ -12,7 +12,7 @@ path: /home/{{ payara_user }}/stash/datagateway-download-api state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Copy over {{ payara_user }} setup.properties" @@ -20,7 +20,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/stash/datagateway-download-api/1-part owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 - name: "Copy over setup.properties" @@ -28,7 +28,7 @@ src: templates/setup.properties.j2 dest: /home/{{ payara_user }}/stash/datagateway-download-api/2-part owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 - name: "Configure setup.properties by concatenation of files in the stash" @@ -37,7 +37,7 @@ dest: /home/{{ payara_user }}/install/datagateway-download-api/setup.properties delimiter: '\n' owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 notify: - "datagateway_download_api-handler" diff --git a/roles/datagateway_download_api/tasks/main.yml b/roles/datagateway_download_api/tasks/main.yml index e028cc5..f4a3ea9 100644 --- a/roles/datagateway_download_api/tasks/main.yml +++ b/roles/datagateway_download_api/tasks/main.yml @@ -15,7 +15,7 @@ extension: "zip" dest: "/home/{{ payara_user }}/downloads/datagateway-download-api-{{ datagateway_download_api_version }}-distro.zip" owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -25,7 +25,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' when: ansible_local.local.instantiations.datagateway_download_api is not defined or ansible_local.local.versions.datagateway_download_api != datagateway_download_api_version - name: "Find any war files not matching the current version" @@ -67,7 +67,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/datagateway-download-api/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -89,7 +89,7 @@ src: files/run.properties dest: /home/{{ payara_user }}/install/datagateway-download-api/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -100,7 +100,7 @@ src: templates/run.properties.j2 dest: /home/{{ payara_user }}/install/datagateway-download-api/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -111,7 +111,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/datagateway-download-api/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "datagateway_download_api-handler" diff --git a/roles/dev_common/tasks/main.yml b/roles/dev_common/tasks/main.yml index 6489fa7..861b921 100644 --- a/roles/dev_common/tasks/main.yml +++ b/roles/dev_common/tasks/main.yml @@ -25,7 +25,7 @@ path: /home/{{ payara_user }}/.m2 state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Add maven settings file to maven home" @@ -33,7 +33,7 @@ src: templates/settings.xml.j2 dest: /home/{{ payara_user }}/.m2/settings.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 # Payara 6+ creates its trust store in PKCS12 format, however the javax.net.ssl.trustStore parameter in ~/.m2/settings.xml only seems to work with JKS format @@ -52,7 +52,7 @@ path: /home/{{ payara_user }}/test/data/ids/main state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Make test ids archive folder" @@ -60,7 +60,7 @@ path: /home/{{ payara_user }}/test/data/ids/archive state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Make test ids cache folder" @@ -68,5 +68,5 @@ path: /home/{{ payara_user }}/test/data/ids/cache state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 diff --git a/roles/icat_lucene/tasks/main.yml b/roles/icat_lucene/tasks/main.yml index 8ad8f0a..df2f307 100644 --- a/roles/icat_lucene/tasks/main.yml +++ b/roles/icat_lucene/tasks/main.yml @@ -14,7 +14,7 @@ extension: "zip" dest: "/home/{{ payara_user }}/downloads/icat.lucene-{{ icat_lucene_version }}-distro.zip" owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' when: ansible_local.local.instantiations.icat_lucene is not defined or ansible_local.local.versions.icat_lucene != icat_lucene_version - name: "Find any war files not matching the current version" @@ -50,7 +50,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/icat.lucene/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -61,7 +61,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/install/icat.lucene/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false notify: @@ -77,7 +77,7 @@ src: files/run.properties dest: /home/{{ payara_user }}/install/icat.lucene/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -88,7 +88,7 @@ src: templates/run.properties.j2 dest: /home/{{ payara_user }}/install/icat.lucene/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -99,7 +99,7 @@ path: /home/{{ payara_user }}/{{ icat_lucene_data_dir }} state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Configure icat_lucene logback.xml" @@ -107,7 +107,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/icat.lucene/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "icat_lucene-handler" diff --git a/roles/icat_server/tasks/create-run-properties.yml b/roles/icat_server/tasks/create-run-properties.yml index 6e9dfbc..5e603d3 100644 --- a/roles/icat_server/tasks/create-run-properties.yml +++ b/roles/icat_server/tasks/create-run-properties.yml @@ -10,7 +10,7 @@ src: files/run.properties dest: /home/{{ payara_user }}/install/icat.server/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true @@ -21,6 +21,6 @@ src: '{{ role_path }}/../icat_server/templates/run.properties.j2' dest: /home/{{ payara_user }}/install/icat.server/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false diff --git a/roles/icat_server/tasks/create-setup-properties.yml b/roles/icat_server/tasks/create-setup-properties.yml index 9ae61f3..93ac29f 100644 --- a/roles/icat_server/tasks/create-setup-properties.yml +++ b/roles/icat_server/tasks/create-setup-properties.yml @@ -3,7 +3,7 @@ path: /home/{{ payara_user }}/stash state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Create a stash directory for icat_server configs" @@ -11,7 +11,7 @@ path: /home/{{ payara_user }}/stash/icat_server state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Copy over payara setup.properties" @@ -19,7 +19,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/stash/icat_server/1-part owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 - name: "Copy over icat_server setup.properties via templating [MariaDB]" @@ -27,7 +27,7 @@ src: templates/mariadb.setup.properties.j2 dest: /home/{{ payara_user }}/stash/icat_server/2-part owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0644 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false and (ansible_local.local.instantiations.mariadb is defined and ansible_local.local.instantiations.mariadb == 'true') @@ -36,7 +36,7 @@ src: templates/oracle.setup.properties.j2 dest: /home/{{ payara_user }}/stash/icat-server/2-part owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0644 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false and (ansible_local.local.instantiations.mariadb is not defined or ansible_local.local.instantiations.mariadb == 'false') @@ -46,7 +46,7 @@ dest: /home/{{ payara_user }}/install/icat.server/setup.properties delimiter: '\n' owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 notify: - "icat_server-handler" diff --git a/roles/icat_server/tasks/main.yml b/roles/icat_server/tasks/main.yml index 17273fd..2c5d251 100644 --- a/roles/icat_server/tasks/main.yml +++ b/roles/icat_server/tasks/main.yml @@ -25,7 +25,7 @@ extension: "zip" dest: "/home/{{ payara_user }}/downloads/icat.server-{{ icat_server_version }}-distro.zip" owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -35,7 +35,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" when: ansible_local.local.instantiations.icat_server is not defined or ansible_local.local.versions.icat_server != icat_server_version - name: "Find any war files not matching the current version" @@ -56,7 +56,7 @@ path: /home/{{ payara_user }}/bin state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Add path to payara user bin directory for icat_server to PATH variable" @@ -74,7 +74,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/icat.server/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -96,7 +96,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/icat.server/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "icat_server-handler" diff --git a/roles/icat_server_dev/tasks/main.yml b/roles/icat_server_dev/tasks/main.yml index be34ed4..a604bec 100644 --- a/roles/icat_server_dev/tasks/main.yml +++ b/roles/icat_server_dev/tasks/main.yml @@ -5,7 +5,7 @@ path: /home/{{ payara_user }}/code state: directory owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' mode: 0775 - name: 'Clone icat_server repository' @@ -21,7 +21,7 @@ src: templates/run.properties.j2 dest: /home/{{ payara_user }}/code/icat.server/src/main/resources/run.properties owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' mode: 0664 notify: - "icat_server_dev-handler" @@ -31,7 +31,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/code/icat.server/src/main/resources/logback.xml owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' mode: 0664 notify: - "icat_server_dev-handler" diff --git a/roles/ids_server/tasks/create-setup-properties.yml b/roles/ids_server/tasks/create-setup-properties.yml index 0d3e97b..82a965e 100644 --- a/roles/ids_server/tasks/create-setup-properties.yml +++ b/roles/ids_server/tasks/create-setup-properties.yml @@ -3,7 +3,7 @@ path: /home/{{ payara_user }}/stash state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Create a stash directory for ids_server configs" @@ -11,7 +11,7 @@ path: /home/{{ payara_user }}/stash/ids_server state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Copy over {{ payara_user }} setup.properties" @@ -19,7 +19,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/stash/ids_server/1-part owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 - name: "Copy over ids_server setup.properties" @@ -27,7 +27,7 @@ src: templates/setup.properties.j2 dest: /home/{{ payara_user }}/stash/ids_server/2-part owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 - name: "Configure ids_server setup.properties by concatenation of files in the stash" @@ -36,7 +36,7 @@ dest: /home/{{ payara_user }}/install/ids.server/setup.properties delimiter: '\n' owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 notify: - "ids_server-handler" diff --git a/roles/ids_server/tasks/main.yml b/roles/ids_server/tasks/main.yml index 98aa82a..123a271 100644 --- a/roles/ids_server/tasks/main.yml +++ b/roles/ids_server/tasks/main.yml @@ -14,7 +14,7 @@ extension: "zip" dest: "/home/{{ payara_user }}/downloads/ids.server-{{ ids_server_version }}-distro.zip" owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' when: ansible_local.local.instantiations.ids_server is not defined or ansible_local.local.versions.ids_server != ids_server_version - name: "Find any war files not matching the current version" @@ -45,7 +45,7 @@ path: /home/{{ payara_user }}/data/main state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Create archive data directory" @@ -53,7 +53,7 @@ path: /home/{{ payara_user }}/data/archive state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Create cache data directory" @@ -61,7 +61,7 @@ path: /home/{{ payara_user }}/data/cache state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Create filesCheck output directory" @@ -69,7 +69,7 @@ path: /home/{{ payara_user }}/logs state: directory owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0775 - name: "Check setup.properties file existence" @@ -82,7 +82,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/ids.server/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -104,7 +104,7 @@ src: files/run.properties dest: /home/{{ payara_user }}/install/ids.server/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true notify: @@ -115,7 +115,7 @@ src: templates/run.properties.j2 dest: /home/{{ payara_user }}/install/ids.server/run.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false notify: @@ -126,7 +126,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/ids.server/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "ids_server-handler" diff --git a/roles/ids_storage_file/tasks/main.yml b/roles/ids_storage_file/tasks/main.yml index 553b2f8..8263591 100644 --- a/roles/ids_storage_file/tasks/main.yml +++ b/roles/ids_storage_file/tasks/main.yml @@ -14,7 +14,7 @@ extension: "zip" dest: "/home/{{ payara_user }}/downloads/ids.storage_file-{{ ids_storage_file_version }}-distro.zip" owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' when: ansible_local.local.instantiations.ids_storage_file is not defined or ansible_local.local.versions.ids_storage_file != ids_storage_file_version # IDS Storage File uses jar files, not war files like other ICAT components @@ -51,7 +51,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/ids.storage_file/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -62,7 +62,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/install/ids.storage_file/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false notify: diff --git a/roles/ids_storaged_plugin/tasks/main.yml b/roles/ids_storaged_plugin/tasks/main.yml index 466ec76..039eb78 100644 --- a/roles/ids_storaged_plugin/tasks/main.yml +++ b/roles/ids_storaged_plugin/tasks/main.yml @@ -9,7 +9,7 @@ url: http://nexus.esc.rl.ac.uk:8081/nexus/service/local/repositories/releases/content/uk/ac/rl/esc/storaged-ids-plugin/{{ ids_storaged_plugin_version }}/storaged-ids-plugin-{{ ids_storaged_plugin_version }}-distro.zip dest: /home/{{ payara_user }}/downloads owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -24,7 +24,7 @@ dest: /home/{{ payara_user }}/install remote_src: true owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" when: installationResult.stat.exists is defined and installationResult.stat.exists == false - name: "Check setup.properties file existence" @@ -37,7 +37,7 @@ src: files/setup.properties dest: /home/{{ payara_user }}/install/storaged-ids-plugin/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true notify: @@ -48,7 +48,7 @@ src: "{{ role_path }}/../payara/templates/setup.properties.j2" dest: /home/{{ payara_user }}/install/storaged-ids-plugin/setup.properties owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0600 when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false notify: @@ -59,7 +59,7 @@ src: files/logback.xml dest: /home/{{ payara_user }}/install/storaged-ids-plugin/logback.xml owner: "{{ payara_user }}" - group: "{{ payara_user }}" + group: "{{ payara_user_group }}" mode: 0664 notify: - "ids_storaged_plugin-handler" diff --git a/roles/payara/tasks/main.yml b/roles/payara/tasks/main.yml index 8db8ecc..3a87b4e 100644 --- a/roles/payara/tasks/main.yml +++ b/roles/payara/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: 'Create payara user group' group: - name: '{{ payara_user }}' + name: '{{ payara_user_group }}' state: present - name: 'Create payara user' @@ -9,7 +9,7 @@ name: '{{ payara_user }}' createhome: true local: '{{ payara_user_local }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' shell: /bin/bash - name: 'Create downloads directory' @@ -17,7 +17,7 @@ path: /home/{{ payara_user }}/downloads state: directory owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' mode: 0775 - name: 'Create install directory' @@ -25,7 +25,7 @@ path: /home/{{ payara_user }}/install state: directory owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' mode: 0775 - name: 'Create scripts directory' @@ -33,7 +33,7 @@ path: /home/{{ payara_user }}/scripts state: directory owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' mode: 0775 - name: 'Create unpackage directory' @@ -41,7 +41,7 @@ path: /home/{{ payara_user }}/unpackage state: directory owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' mode: 0775 - name: 'Install payara init script' @@ -81,7 +81,7 @@ url: http://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara/{{ payara_version }}/payara-{{ payara_version }}.zip dest: /home/{{ payara_user }}/downloads owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' mode: 0664 when: packageResult.stat.exists is defined and packageResult.stat.exists == false @@ -95,7 +95,7 @@ url: https://icatproject.org/misc/scripts/setup-glassfish.py dest: /home/{{ payara_user }}/scripts owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' mode: 0664 when: scriptResult.stat.exists is defined and scriptResult.stat.exists == false @@ -118,7 +118,7 @@ dest: /home/{{ payara_user }}/unpackage remote_src: true owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' when: installationResult.stat.exists is defined and installationResult.stat.exists == false - name: 'Move contents of /home/{{ payara_user }}/unpackage' @@ -169,7 +169,7 @@ path: '{{ payara_domain_dir }}/lib/mysql-connector-j.jar' state: link owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' follow: no force: yes when: install_mysql_connector_j | bool @@ -190,7 +190,7 @@ state: directory path: '{{ payara_domain_dir }}/lib/ext' owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' when: install_ojdbc11_jar | bool notify: payara-handler @@ -200,7 +200,7 @@ path: '{{ payara_domain_dir }}/lib/ext/ojdbc11.jar' state: link owner: '{{ payara_user }}' - group: '{{ payara_user }}' + group: '{{ payara_user_group }}' follow: no force: yes when: install_ojdbc11_jar | bool