ITOPSENG-716 Create Catalina folder in tomcat-install/conf ownder by product user, but leave the rest of conf owned by root. This reinstates catalina.out logging, as it needs that folder to exist and be owned by the product user/group.

This commit is contained in:
Denise Unterwurzacher
2020-07-16 12:20:23 -05:00
parent d428624ac2
commit 0a7e5220a2
8 changed files with 32 additions and 1 deletions

View File

@@ -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/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/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/logs/').user == 'confluence'
assert host.file('/opt/atlassian/confluence/current/work/').user == 'confluence' assert host.file('/opt/atlassian/confluence/current/work/').user == 'confluence'
assert host.file('/opt/atlassian/confluence/current/temp/').user == 'confluence' assert host.file('/opt/atlassian/confluence/current/temp/').user == 'confluence'

View File

@@ -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/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/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/logs/').user == 'confluence'
assert host.file('/opt/atlassian/confluence/current/work/').user == 'confluence' assert host.file('/opt/atlassian/confluence/current/work/').user == 'confluence'
assert host.file('/opt/atlassian/confluence/current/temp/').user == 'confluence' assert host.file('/opt/atlassian/confluence/current/temp/').user == 'confluence'

View File

@@ -97,6 +97,15 @@
- "{{ atl_product_installation_versioned }}/work" - "{{ atl_product_installation_versioned }}/work"
changed_when: false # For Molecule idempotence check 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 - name: Assert baseurl to same as atl_proxy_name
postgresql_query: postgresql_query:
login_host: "{{ atl_db_host }}" login_host: "{{ atl_db_host }}"

View File

@@ -93,6 +93,15 @@
- "{{ atl_product_installation_versioned }}/apache-tomcat/work" - "{{ atl_product_installation_versioned }}/apache-tomcat/work"
changed_when: false # For Molecule idempotence check 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 - name: Symlink Crowd shared home directory
file: file:
src: "{{ atl_product_home_shared }}" src: "{{ atl_product_home_shared }}"

View File

@@ -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/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/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/logs/').user == 'jira'
assert host.file('/opt/atlassian/jira-software/current/work/').user == 'jira' assert host.file('/opt/atlassian/jira-software/current/work/').user == 'jira'
assert host.file('/opt/atlassian/jira-software/current/temp/').user == 'jira' assert host.file('/opt/atlassian/jira-software/current/temp/').user == 'jira'

View File

@@ -73,9 +73,9 @@ def test_server_file(host):
def test_install_permissions(host): 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/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/logs/').user == 'jira'
assert host.file('/opt/atlassian/jira-software/current/work/').user == 'jira' assert host.file('/opt/atlassian/jira-software/current/work/').user == 'jira'
assert host.file('/opt/atlassian/jira-software/current/temp/').user == 'jira' assert host.file('/opt/atlassian/jira-software/current/temp/').user == 'jira'

View File

@@ -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/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/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/logs/').user == 'jira'
assert host.file('/opt/atlassian/jira-software/current/work/').user == 'jira' assert host.file('/opt/atlassian/jira-software/current/work/').user == 'jira'
assert host.file('/opt/atlassian/jira-software/current/temp/').user == 'jira' assert host.file('/opt/atlassian/jira-software/current/temp/').user == 'jira'

View File

@@ -100,6 +100,15 @@
- "{{ atl_product_installation_versioned }}/work" - "{{ atl_product_installation_versioned }}/work"
changed_when: false # For Molecule idempotence check 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 - name: Assert baseurl to same as atl_proxy_name
postgresql_query: postgresql_query:
login_host: "{{ atl_db_host }}" login_host: "{{ atl_db_host }}"