Optimize file directory handling

tasks/files.yml

+---
+# file: roles/drupal/tasks/files.yml
+
+- set_fact: dir={{ webRoot }}/files/{{ item.0.shortname|default("default") }}/{{ item.1 }}
+- 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'

tasks/install.yml

@@ -91,17 +91,6 @@
       mode='755'
     with_items: '{{ drupal.domains }}'
 
-  - 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: "Ensure Site Directories"
     file:
       dest='{{ drupalRoot }}/sites/{{ item.shortname|default("default") }}'
@@ -111,25 +100,7 @@
       mode='755'
     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'
+  - include: files.yml
     with_nested:
       - '{{ drupal.domains }}'
       - ['files', 'private']