From cd2ec0333b2ebc20dcb982b7e1bdc65c6158d61a Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 17 Jan 2020 23:35:24 -0500 Subject: [PATCH 1/2] Cleaner wordpress/tasks/install.yml --- roles/wordpress/tasks/install.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml index a858c346f..6a8a21f9e 100644 --- a/roles/wordpress/tasks/install.yml +++ b/roles/wordpress/tasks/install.yml @@ -36,10 +36,10 @@ msg: "{{ downloads_dir }}/wordpress.tar.gz is REQUIRED in order to install WordPress." when: not wp_link.stat.exists -- name: "Unpack /opt/iiab/downloads/wordpress.tar.gz to permanent location /library/wordpress - owner: root, group: {{ apache_user }}, mode: 0664, keep_newer: yes" +- name: "Unpack {{ downloads_dir }}/wordpress.tar.gz to permanent location {{ wp_install_path }}/wordpress - owner: root, group: {{ apache_user }}, mode: '0664', keep_newer: yes" unarchive: - src: "{{ downloads_dir }}/wordpress.tar.gz" - dest: "{{ wp_install_path }}" + src: "{{ downloads_dir }}/wordpress.tar.gz" # /opt/iiab/downloads + dest: "{{ wp_install_path }}" # /library owner: root # 2020-01-17: confirmed that wordpress.tar.gz (otherwise) unpacks as nobody:nogroup, with all files as '0644', and all dirs as '0755' group: "{{ apache_user }}" # DO WE REALLY STILL WANT THIS FOR NGINX? mode: '0664' # PHP/Apache/NGINX apparently need g+rw (group write access, not just read) similar to '0775' for directory traversing below From ed2de9f35d35967b38e53dbfbd586fa4372d2ecb Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 17 Jan 2020 23:50:31 -0500 Subject: [PATCH 2/2] 'osm_vector_maps_installed: True' for /etc/iiab/iiab_state.yml --- roles/osm-vector-maps/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/osm-vector-maps/tasks/main.yml b/roles/osm-vector-maps/tasks/main.yml index 1eb1299e0..c6e53b3ae 100644 --- a/roles/osm-vector-maps/tasks/main.yml +++ b/roles/osm-vector-maps/tasks/main.yml @@ -98,3 +98,9 @@ systemd: name: nginx state: reloaded + +- name: "Add 'osm_vector_maps_installed: True' to {{ iiab_state_file }}" + lineinfile: + dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + regexp: '^osm_vector_maps_installed' + line: 'osm_vector_maps_installed: True'