Merge pull request #62 from dpsommer/2.5.x

Updated Ubuntu airtime-full-install to fix apache version issue

install_full/ubuntu/airtime-full-install

@@ -29,6 +29,8 @@ echo "----------------------------------------------------"
 
 dist=`lsb_release -is`
 code=`lsb_release -cs`
+apache2 -v | grep "2\.4" > /dev/null
+apacheversion=$?
 
 #enable squeeze backports to get lame packages
 if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then
@@ -130,16 +132,18 @@ else
     echo "----------------------------------------------------"
     echo "2.1 Apache Config File"
     echo "----------------------------------------------------"
-    if [ ! -f /etc/apache2/sites-available/airtime ]; then
+
+    if [ "$apacheversion" != "1" ]; then
+	airtimeconfigfile="airtime.conf"
+    else
+	airtimeconfigfile="airtime"
+    fi
+
+    if [ ! -f /etc/apache2/sites-available/$airtimeconfigfile ]; then
         echo "Creating Apache config for Airtime..."
 
-        if [ "$dist" = "Ubuntu" -a "$code" = "saucy" ]; then
-	    cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime.conf
+	cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/$airtimeconfigfile
         a2dissite 000-default
-        else
-	    cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime
-            a2dissite default
-        fi
         a2ensite airtime
     else
         echo "Apache config for Airtime already exists..."

install_minimal/include/AirtimeInstall.php

@@ -177,6 +177,7 @@ class AirtimeInstall
             }
 
             echo "* Giving Apache permission to access $rp".PHP_EOL;
+            $success = chown($rp, $CC_CONFIG["webServerUser"]);
             $success = chgrp($rp, $CC_CONFIG["webServerUser"]);
             $success = chmod($rp, 0775);
         }