#3 Ensure prefixes and directories

tasks/apache.yml

@@ -73,6 +73,13 @@
   notify: "Apache | Restart Apache"
 
 - name: "Apache | Create htdocs directory for default"
+  file:
+    dest=/var/www{{ apache_server_default_root }}
+    state=directory
+    owner=www-data
+    group=www-data
+
+- name: "Apache | Create htdocs directory for SVN default"
   file:
     dest=/var/www/{{ apache_server_default_svn_target }}
     state=directory
@@ -102,7 +109,7 @@
 - name: "Apache | Configuration file for default ssl site"
   template:
     src=etc-apache2-sites-available-default-ssl
-    dest=/etc/apache2/sites-available/default-ssl{{ apache_conf_ext }}
+    dest=/etc/apache2/sites-available/{{ apache_conf_default_prefix }}default-ssl{{ apache_conf_ext }}
     owner=root
     group=root
     mode=0644
@@ -124,11 +131,11 @@
     - "Apache | Checkout htdocs for our site(s)"
 
 - name: "Apache | Enable the default site"
-  command: a2ensite default creates=/etc/apache2/sites-enabled/000-default{{ apache_conf_ext }}
+  command: a2ensite {{ apache_conf_default_prefix }}default creates=/etc/apache2/sites-enabled/{{ apache_conf_default_prefix }}default{{ apache_conf_ext }}
   when: apache_server_default == "yes"
 
 - name: "Apache | Enable the default ssl site"
-  command: a2ensite default-ssl creates=/etc/apache2/sites-enabled/default-ssl{{ apache_conf_ext }}
+  command: a2ensite {{ apache_conf_default_prefix }}default-ssl creates=/etc/apache2/sites-enabled/{{ apache_conf_default_prefix }}default-ssl{{ apache_conf_ext }}
   when: apache_server_default_ssl == "yes"
 
 - name: "Apache | Enable our new site(s)"