Merged in ITOPSENG-716/reinstate-catalina.out (pull request #106)

ITOPSENG-716 Reinstate catalina.out logging

Approved-by: Steve Smith
Approved-by: Ben Partridge

roles/bitbucket_config/tasks/main.yml

@@ -23,3 +23,12 @@
     mode: "u=rwX,g=rX,o=rX"
     recurse: true
   changed_when: false  # For Molecule idempotence check
+
+- name: Create conf/Catalina directory so catalina.out logging works
+  file:
+    path: "{{ atl_product_installation_versioned }}/conf/Catalina"
+    state: directory
+    mode: "u=rwX,g=rX,o-rwx"
+    owner: "{{ atl_product_user }}"
+    group: "{{ atl_product_user }}"
+  changed_when: false  # For Molecule idempotence check

roles/confluence_config/molecule/aurora/tests/test_aurora.py

@@ -45,6 +45,7 @@ def test_install_permissions(host):
     assert host.file('/opt/atlassian/confluence/current/conf/server.xml').user == 'root'
     assert host.file('/opt/atlassian/confluence/current/confluence/WEB-INF/web.xml').user == 'root'
 
+    assert host.file('/opt/atlassian/confluence/current/conf/Catalina').user == 'confluence'
     assert host.file('/opt/atlassian/confluence/current/logs/').user == 'confluence'
     assert host.file('/opt/atlassian/confluence/current/work/').user == 'confluence'
     assert host.file('/opt/atlassian/confluence/current/temp/').user == 'confluence'

roles/confluence_config/molecule/default/tests/test_default.py

@@ -55,6 +55,7 @@ def test_install_permissions(host):
     assert host.file('/opt/atlassian/confluence/current/conf/server.xml').user == 'root'
     assert host.file('/opt/atlassian/confluence/current/confluence/WEB-INF/web.xml').user == 'root'
 
+    assert host.file('/opt/atlassian/confluence/current/conf/Catalina').user == 'confluence'
     assert host.file('/opt/atlassian/confluence/current/logs/').user == 'confluence'
     assert host.file('/opt/atlassian/confluence/current/work/').user == 'confluence'
     assert host.file('/opt/atlassian/confluence/current/temp/').user == 'confluence'

roles/confluence_config/tasks/main.yml

@@ -97,6 +97,15 @@
     - "{{ atl_product_installation_versioned }}/work"
   changed_when: false  # For Molecule idempotence check
 
+- name: Create conf/Catalina directory owned by product so catalina.out logging works
+  file:
+    path: "{{ atl_product_installation_versioned }}/conf/Catalina"
+    state: directory
+    mode: "u=rwX,g=rX,o-rwx"
+    owner: "{{ atl_product_user }}"
+    group: "{{ atl_product_user }}"
+  changed_when: false  # For Molecule idempotence check
+
 - name: Assert baseurl to same as atl_proxy_name
   postgresql_query:
     login_host: "{{ atl_db_host }}"

roles/crowd_config/tasks/main.yml

@@ -93,6 +93,15 @@
     - "{{ atl_product_installation_versioned }}/apache-tomcat/work"
   changed_when: false  # For Molecule idempotence check
 
+- name: Create conf/Catalina directory owned by product so catalina.out logging works
+  file:
+    path: "{{ atl_product_installation_versioned }}/conf/Catalina"
+    state: directory
+    mode: "u=rwX,g=rX,o-rwx"
+    owner: "{{ atl_product_user }}"
+    group: "{{ atl_product_user }}"
+  changed_when: false  # For Molecule idempotence check
+
 - name: Symlink Crowd shared home directory
   file:
     src: "{{ atl_product_home_shared }}"

roles/jira_config/molecule/aurora/tests/test_default.py

@@ -70,6 +70,7 @@ def test_install_permissions(host):
     assert host.file('/opt/atlassian/jira-software/current/conf/server.xml').user == 'root'
     assert host.file('/opt/atlassian/jira-software/current/atlassian-jira/WEB-INF/web.xml').user == 'root'
 
+    assert host.file('/opt/atlassian/jira-software/current/conf/Catalina').user == 'jira'
     assert host.file('/opt/atlassian/jira-software/current/logs/').user == 'jira'
     assert host.file('/opt/atlassian/jira-software/current/work/').user == 'jira'
     assert host.file('/opt/atlassian/jira-software/current/temp/').user == 'jira'

roles/jira_config/molecule/default/tests/test_default.py

@@ -76,6 +76,7 @@ def test_install_permissions(host):
     assert host.file('/opt/atlassian/jira-software/current/conf/server.xml').user == 'root'
     assert host.file('/opt/atlassian/jira-software/current/atlassian-jira/WEB-INF/web.xml').user == 'root'
 
+    assert host.file('/opt/atlassian/jira-software/current/conf/Catalina').user == 'jira'
     assert host.file('/opt/atlassian/jira-software/current/logs/').user == 'jira'
     assert host.file('/opt/atlassian/jira-software/current/work/').user == 'jira'
     assert host.file('/opt/atlassian/jira-software/current/temp/').user == 'jira'

roles/jira_config/molecule/jira_config_props/tests/test_default.py

@@ -77,6 +77,7 @@ def test_install_permissions(host):
     assert host.file('/opt/atlassian/jira-software/current/conf/server.xml').user == 'root'
     assert host.file('/opt/atlassian/jira-software/current/atlassian-jira/WEB-INF/web.xml').user == 'root'
 
+    assert host.file('/opt/atlassian/jira-software/current/conf/Catalina').user == 'jira'
     assert host.file('/opt/atlassian/jira-software/current/logs/').user == 'jira'
     assert host.file('/opt/atlassian/jira-software/current/work/').user == 'jira'
     assert host.file('/opt/atlassian/jira-software/current/temp/').user == 'jira'

roles/jira_config/tasks/main.yml

@@ -100,6 +100,15 @@
     - "{{ atl_product_installation_versioned }}/work"
   changed_when: false  # For Molecule idempotence check
 
+- name: Create conf/Catalina directory owned by product so catalina.out logging works
+  file:
+    path: "{{ atl_product_installation_versioned }}/conf/Catalina"
+    state: directory
+    mode: "u=rwX,g=rX,o-rwx"
+    owner: "{{ atl_product_user }}"
+    group: "{{ atl_product_user }}"
+  changed_when: false  # For Molecule idempotence check
+
 - name: Assert baseurl to same as atl_proxy_name
   postgresql_query:
     login_host: "{{ atl_db_host }}"