Optimize file directory handling

tasks/files.yml

@@ -5,35 +5,38 @@
 - set_fact: src={{ relativeRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }}
 - set_fact: dest={{ drupalRoot }}/sites/{{ item.0.shortname|default("default") }}/{{ item.1 }}
 
-  - name: "Ensure File Directories"
-    file:
-      dest='{{ dir }}'
-      state='directory'
-      owner='{{ apacheUser }}'
-      group='{{ apacheUser }}'
-      mode='755'
-
-  - name: "Check the status of the File Directory"
-    stat: path='{{ dest }}'
-    register: directory
-
-  - block:
-    shell: rm -rf {{ dir }} && mv {{ dest }} {{ dir }}
-    when: directory.exists and directory.isdir
-
-  - name: "Link Site Directory to File Directory"
-    file:
-      src='{{ src }}'
-      dest='{{ dest }}'
-      state='link'
-      owner='{{ apacheUser }}'
-      group='{{ apacheUser }}'
-      mode='755'
-
-  - name: "Ensure .htaccess"
-    template:
-      src='.htaccess'
-      dest='{{ dir }}/.htaccess'
-      owner='{{ apacheUser }}'
-      group='{{ apacheUser }}'
-      mode='444'
+- name: "Ensure File Directories"
+  file:
+    dest='{{ webRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }}'
+    state='directory'
+    owner='{{ apacheUser }}'
+    group='{{ apacheUser }}'
+    mode='755'
+
+- name: "Check the status of the File Directory"
+  stat: path='{{ drupalRoot }}/sites/{{ item.0.shortname|default("default") }}/{{ item.1 }}'
+  register: directory
+
+- block:
+
+  - name: "Move existing File Directory"
+    shell: rm -rf {{ webRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }} && mv {{ drupalRoot }}/sites/{{ item.0.shortname|default("default") }}/{{ item.1 }} {{ webRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }}
+
+  when: directory.exists and directory.isdir
+
+- name: "Link Site Directory to File Directory"
+  file:
+    src='{{ relativeRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }}'
+    dest='{{ drupalRoot }}/sites/{{ item.0.shortname|default("default") }}/{{ item.1 }}'
+    state='link'
+    owner='{{ apacheUser }}'
+    group='{{ apacheUser }}'
+    mode='755'
+
+- name: "Ensure .htaccess"
+  template:
+    src='.htaccess'
+    dest='{{ webRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }}/.htaccess'
+    owner='{{ apacheUser }}'
+    group='{{ apacheUser }}'
+    mode='444'

tasks/install.yml

@@ -100,7 +100,51 @@
       mode='755'
     with_items: '{{ drupal.domains }}'
 
-  - include: files.yml
+# TODO: The following should be working as soon as Ansible 2.1 is out
+#  - include: files.yml
+#    with_nested:
+#      - '{{ drupal.domains }}'
+#      - ['files', 'private']
+
+  - name: "Ensure File Directories"
+    file:
+      dest='{{ webRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }}'
+      state='directory'
+      owner='{{ apacheUser }}'
+      group='{{ apacheUser }}'
+      mode='755'
+    with_nested:
+      - '{{ drupal.domains }}'
+      - ['files', 'private']
+
+  - name: "Check the status of the File Directory"
+    stat: path='{{ drupalRoot }}/sites/{{ item.shortname|default("default") }}/files'
+    register: directory
+    with_items: '{{ drupal.domains }}'
+
+  - name: "Move existing File Directory"
+    shell: rm -rf {{ webRoot }}/files/{{ item.shortname|default("default") }}/files && mv {{ drupalRoot }}/sites/{{ item.shortname|default("default") }}/files {{ webRoot }}/files/{{ item.shortname|default("default") }}/files
+    with_items: '{{ drupal.domains }}'
+
+  - name: "Link Site Directory to File Directory"
+    file:
+      src='{{ relativeRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }}'
+      dest='{{ drupalRoot }}/sites/{{ item.0.shortname|default("default") }}/{{ item.1 }}'
+      state='link'
+      owner='{{ apacheUser }}'
+      group='{{ apacheUser }}'
+      mode='755'
+    with_nested:
+      - '{{ drupal.domains }}'
+      - ['files', 'private']
+
+  - name: "Ensure .htaccess"
+    template:
+      src='.htaccess'
+      dest='{{ webRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }}/.htaccess'
+      owner='{{ apacheUser }}'
+      group='{{ apacheUser }}'
+      mode='444'
     with_nested:
       - '{{ drupal.domains }}'
       - ['files', 'private']