-clean up full_install scripts

install_full/ubuntu/airtime-full-install

@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/bash -e
 #
 # Auto install script for airtime on Ubuntu
 #
 
-exec > >(tee install_log.txt)
+exec >> (tee install_log.txt)
 exec 2>&1
 
 if [ "$(id -u)" != "0" ]; then
@@ -55,25 +55,16 @@ else
     apt-get -y install libzend-framework-php
 fi
 
-
-
-if [ "$?" -ne "0" ]; then
-   echo ""
-   echo "There was a problem with apt-get. Please check the above error and try again."
-   echo ""
-   exit 1
-fi
-
 # Apache Config File
 echo "----------------------------------------------------"
 echo "2. Apache Config File"
 echo "----------------------------------------------------"
 if [ ! -f /etc/apache2/sites-available/airtime ]; then
     cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime
-	rm -rf /etc/apache2/sites-enabled/000-default
-	ln -s /etc/apache2/sites-available/airtime /etc/apache2/sites-enabled/airtime
+    a2dissite default
+    a2ensite airtime
     a2enmod rewrite php5
-	service apache2 restart
+    service apache2 reload
 else
 	echo "Apache config for Airtime already exists..."
 fi
@@ -107,5 +98,3 @@ echo "5. Run Airtime Install"
 echo "----------------------------------------------------"
 cd $SCRIPTPATH/../../install_minimal
 ./airtime-install
-
-

install_full/ubuntu/airtime-full-install-nginx

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 #
 # Auto install script for airtime on Ubuntu
 #
@@ -6,7 +6,7 @@
 # Link to the post:
 # http://forum.sourcefabric.org/discussion/13563/first-step-to-run-airtime-via-nginx-based-on-airtime-2.0-beta-files
 
-exec > >(tee install_log.txt)
+exec >> (tee install_log.txt)
 exec 2>&1
 
 if [ "$(id -u)" != "0" ]; then
@@ -57,14 +57,6 @@ else
     apt-get -y install libzend-framework-php
 fi
 
-
-if [ "$?" -ne "0" ]; then
-   echo ""
-   echo "There was a problem with apt-get. Please check the above error and try again."
-   echo ""
-   exit 1
-fi
-
 # NGINX Config File
 echo "----------------------------------------------------"
 echo "2.1 NGINX Config File"