General improvements

templates/apache_default

@@ -5,7 +5,7 @@
 
 # Use this one if you want to force SSL
 <VirtualHost *:80>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
   ServerName youtrack.paragon-es.de
   ServerSignature Off
@@ -17,7 +17,7 @@
 
 # Without SSL, use this one
 <VirtualHost *:80>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
   ServerName youtrack.paragon-es.de
   ServerSignature Off

templates/apache_default_ssl

 <VirtualHost _default_:443>
-  Include /etc/apache2/conf-available/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
     ServerName youtrack.paragon-es.de
     ServerAdmin admin@paragon-es.de
@@ -33,7 +33,7 @@
     </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 \