From 3dc610d33f58e2fcc7b914985fc6b0f6016bf6f1 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 11 Jan 2020 13:17:50 -0500
Subject: [PATCH] Update wordpress/tasks/install.yml

---
 roles/wordpress/tasks/install.yml | 41 +++++++++++--------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml
index 239e2ea56..ac9874da8 100644
--- a/roles/wordpress/tasks/install.yml
+++ b/roles/wordpress/tasks/install.yml
@@ -16,12 +16,12 @@
     url: "{{ wordpress_download_base_url }}/{{ wordpress_src }}"
     dest: "{{ downloads_dir }}"
     timeout: "{{ download_timeout }}"
-#   force: yes
-#   backup: yes
+    # force: yes
+    # backup: yes
   register: wp_download_output
   when: internet_available | bool
 
-- name: Create symlink from /opt/iiab/downloads/wordpress.tar.gz to {{ wp_download_output.dest }}
+- name: Symlink /opt/iiab/downloads/wordpress.tar.gz -> {{ wp_download_output.dest }}
   file:
     src: "{{ wp_download_output.dest }}"
     path: "{{ downloads_dir }}/wordpress.tar.gz"
@@ -43,21 +43,10 @@
     src: "{{ downloads_dir }}/wordpress.tar.gz"
     dest: "{{ wp_install_path }}"
     owner: root
-    group: "{{ apache_user }}"
-    mode: 0664
+    group: "{{ apache_user }}"    # DO WE REALLY STILL WANT THIS FOR NGINX?
+    mode: '0664'
     keep_newer: yes
 
-# - name: Rename /library/wordpress* to /library/wordpress
-#   shell: if [ ! -d {{ wp_abs_path }} ]; then mv {{ wp_abs_path }}* {{ wp_abs_path }}; fi
-
-#- name: Make Apache owner and group, 1st pass permissions set to 0664
-#  file: path={{ wp_abs_path }}
-#        recurse=yes
-#        owner=root
-#        group={{ apache_user }}
-#        mode=0664
-#        state=directory
-
 - name: Make /library/wordpress directories 775 so Apache can traverse and write (most files remain 0664)
   command: "/usr/bin/find {{ wp_abs_path }} -type d -exec chmod 775 {} +"
 
@@ -65,9 +54,9 @@
   copy:
     src: wp-keys.php.BAK
     dest: "{{ wp_abs_path }}/wp-keys.php.BAK"
-    owner: root
-    group: "{{ apache_user }}"
-    mode: 0640
+    owner: root    # Not nec? Remove?
+    group: "{{ apache_user }}"    # DO WE REALLY STILL WANT THIS FOR NGINX?
+    mode: '0640'
 
 # Fetch random salts for WordPress config into wp-keys.php file by generating script and running
 
@@ -75,9 +64,9 @@
   template:
     src: get-iiab-wp-salts.j2
     dest: /tmp/get-iiab-wp-salts
-    owner: root
-    group: root
-    mode: 0700
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0700'
 
 - name: Run /tmp/get-iiab-wp-salts to create /library/wordpress/wp-keys.php
   command: /tmp/get-iiab-wp-salts
@@ -91,15 +80,15 @@
   template:
     src: wp-config.php.j2
     dest: "{{ wp_abs_path }}/wp-config.php"
-    owner: root
-    group: "{{ apache_user }}"
-    mode: 0660
+    owner: root    # Not nec? Remove?
+    group: "{{ apache_user }}"    # DO WE REALLY STILL WANT THIS FOR NGINX?
+    mode: '0660'
 
 - name: Install etc/{{ apache_config_dir }}/wordpress.conf from template, for http://box{{ wp_url }}
   template:
     src: wordpress.conf.j2
     dest: "/etc/{{ apache_config_dir }}/wordpress.conf"
-  when: apache_enabled
+  when: apache_enabled | bool
 
 - name: Add 'wordpress_installed' variable values to {{ iiab_state_file }}
   lineinfile: