Initial fix for apache 2.4 vhost file

install

@@ -326,7 +326,12 @@ if [ "$apache" = "t" ]; then
 
     if [ ! -f /etc/apache2/sites-available/${airtimeconfigfile} ]; then
         verbose "\n * Creating Apache config for Airtime..."
-        sed -e "s@WEB_ROOT@${web_root}@g" ${SCRIPT_DIR}/installer/apache/airtime-vhost > /etc/apache2/sites-available/${airtimeconfigfile}
+        
+        if [ "$apacheversion" != "1" ]; then
+            sed -e "s@WEB_ROOT@${web_root}@g" ${SCRIPT_DIR}/installer/apache/airtime-vhost-2.4 > /etc/apache2/sites-available/${airtimeconfigfile}
+        else
+            sed -e "s@WEB_ROOT@${web_root}@g" ${SCRIPT_DIR}/installer/apache/airtime-vhost > /etc/apache2/sites-available/${airtimeconfigfile}
+        fi
         loudCmd "a2dissite 000-default"
         loudCmd "a2ensite airtime"
     else

installer/apache/airtime-vhost

@@ -13,7 +13,5 @@
       # Apache instance is behind a proxy, so set these here
       UseCanonicalName On
       UseCanonicalPhysicalPort On
-      
-      Require all granted
   </Directory>
 </VirtualHost>

installer/apache/airtime-vhost-2.4

@@ -0,0 +1,19 @@
+<VirtualHost *:80>
+   ServerAdmin foo@bar.org
+   DocumentRoot WEB_ROOT
+   php_admin_value upload_tmp_dir /tmp
+
+  <Directory WEB_ROOT>
+      DirectoryIndex index.php
+      AllowOverride all
+      Order allow,deny
+      Allow from all
+
+      # PHP's server values can be spoofed or incorrect if an 
+      # Apache instance is behind a proxy, so set these here
+      UseCanonicalName On
+      UseCanonicalPhysicalPort On
+      
+      Require all granted
+  </Directory>
+</VirtualHost>