General improvements

templates/vhost.conf

 <VirtualHost *:80>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
 {% if item.protocol|default("https") == "https" and groups.proxyserver is not defined %}
   ServerAdmin {{ apache_server_admin }}
@@ -18,7 +18,7 @@
 </VirtualHost>
 
 <VirtualHost *:443>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
 {% endif %}
   ServerAdmin {{ apache_server_admin }}
@@ -44,7 +44,7 @@
     Order allow,deny
     allow from all
 {% else %}
-    Include /etc/apache2/conf-available/global-deny.conf
+    Include /etc/apache2/{{ apache_conf_dir }}/global-deny.conf
 {% endif %}
 {% endif %}
   </Directory>