Improve initial setup for files directory when mountpoints are used

tasks/files.yml

@@ -6,14 +6,26 @@
     src='{{ relativeRoot }}/files/{{ drupal_domain.0.shortname|default("default") }}/{{ drupal_domain.1 }}'
     dest='{{ drupalRoot }}/sites/{{ drupal_domain.0.shortname|default("default") }}/{{ drupal_domain.1 }}'
 
-- name: "Link webroot to mounted directory"
-  file:
-    src='{{ drupal_domain.0.mountpoint }}/{{ drupal.id }}/{{ drupal_domain.0.shortname|default("default") }}'
-    dest='{{ webRoot }}/files/{{ drupal_domain.0.shortname|default("default") }}'
-    state='link'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    mode='755'
+- block:
+
+  - name: "Ensure mounted directory"
+    file:
+      path='{{ drupal_domain.0.mountpoint }}/{{ drupal.id }}/{{ drupal_domain.0.shortname|default("default") }}'
+      state='directory'
+      owner='{{ apacheUser }}'
+      group='{{ apacheUser }}'
+      mode='755'
+
+  - name: "Link webroot to mounted directory"
+    file:
+      src='{{ drupal_domain.0.mountpoint }}/{{ drupal.id }}/{{ drupal_domain.0.shortname|default("default") }}'
+      dest='{{ webRoot }}/files/{{ drupal_domain.0.shortname|default("default") }}'
+      state='link'
+      owner='{{ apacheUser }}'
+      group='{{ apacheUser }}'
+      mode='755'
+      force='yes'
+
   when: drupal_domain.0.mountpoint is defined
 
 - name: "Ensure File Directories"

tasks/mountpoints.yml

@@ -8,6 +8,7 @@
 - name: "Convert File System Type"
   shell: '{{ fstype_convert[item.fstype] }}'
   when: item.fstype != fstype
+  ignore_errors: True
 
 - name: "Ensure directory for mountpoint"
   file: