General improvements

templates/etc-apache2-conf-available-php5-fpm

@@ -5,6 +5,6 @@
   FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization
 
   <Directory /usr/lib/cgi-bin>
-    Include /etc/apache2/conf-available/global-deny.conf
+    Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
   </Directory>
 </IfModule>

templates/etc-apache2-sites-available-default

 <VirtualHost *:80>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
   ServerAdmin {{apache_server_admin}}
 
@@ -8,7 +8,7 @@
   <Directory />
     Options FollowSymLinks
     AllowOverride None
-    Include /etc/apache2/conf-available/global-deny.conf
+    Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
   </Directory>
   <Directory /var/www{{apache_server_default_root}}/>
     Options Indexes FollowSymLinks MultiViews
@@ -19,7 +19,7 @@
     AuthUserFile /var/www/passwords/{{apache_auth.user}}
     Require user {{apache_auth.user}}
 {% else %}
-    Include /etc/apache2/conf-available/global-deny.conf
+    Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
 {% endif %}
   </Directory>
 
@@ -44,14 +44,14 @@
   <Directory "/var/www/{{alias.path}}/">
     Options Indexes MultiViews FollowSymLinks
     AllowOverride All
-    Include /etc/apache2/conf-available/global-deny.conf
+    Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
   </Directory>
 {% endfor %}
 </VirtualHost>
 {% for alias in apache_server_default_aliases_redirect %}
 
 <VirtualHost *:80>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
   ServerName {{alias.from}}
 {% if alias.secure is defined %}

templates/etc-apache2-sites-available-default-ssl

@@ -2,7 +2,7 @@ NameVirtualHost *:443
 {% for certs in apache_certificates %}
 
 <VirtualHost _default_:443>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
 {% if certs.domain is defined %}
   ServerName {{ certs.domain }}
@@ -18,7 +18,7 @@ NameVirtualHost *:443
   <Directory /var/www{{apache_server_default_root}}/>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride All
-    Include /etc/apache2/conf-available/global-deny.conf
+    Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
   </Directory>
 
   ErrorLog ${APACHE_LOG_DIR}/error.log
@@ -33,7 +33,7 @@ NameVirtualHost *:443
   <Directory "/var/www/{{alias.path}}/">
     Options Indexes MultiViews FollowSymLinks
     AllowOverride All
-    Include /etc/apache2/conf-available/global-deny.conf
+    Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
   </Directory>
 {% endfor %}
 
@@ -47,7 +47,7 @@ NameVirtualHost *:443
   </FilesMatch>
   <Directory /usr/lib/cgi-bin>
     SSLOptions +StdEnvVars
-    Include /etc/apache2/conf-available/global-deny.conf
+    Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
   </Directory>
   BrowserMatch "MSIE [2-6]" \
     nokeepalive ssl-unclean-shutdown \
@@ -59,7 +59,7 @@ NameVirtualHost *:443
 {% for alias in certs.redirects %}
 
 <VirtualHost _default_:443>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
   ServerName {{alias.from}}
   Redirect 301 / https://{{alias.to}}/

templates/etc-apache2-sites-available-vhost

 <VirtualHost *:80>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
   ServerAdmin {{apache_server_admin}}
   ServerName  {{item.domain}}
@@ -10,7 +10,7 @@
   <Directory /var/www/{{item.path}}/>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride All
-    Include /etc/apache2/conf-available/global-deny.conf
+    Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
   </Directory>
 
   ErrorLog ${APACHE_LOG_DIR}/error.log
@@ -25,7 +25,7 @@
     <Directory "/var/www/{{alias.path}}/">
       Options Indexes MultiViews FollowSymLinks
       AllowOverride All
-      Include /etc/apache2/conf-available/global-deny.conf
+      Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
     </Directory>
 {% endfor %}
 </VirtualHost>