From f220594831741e49ad0221859ff140e48152198d Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Wed, 26 Nov 2014 11:08:17 -0500
Subject: [PATCH] Fixes to basic installer

---
 installer/{install.sh => install} | 14 +++++---------
 installer/php/airtime.ini         |  8 ++++++++
 2 files changed, 13 insertions(+), 9 deletions(-)
 rename installer/{install.sh => install} (91%)
 create mode 100644 installer/php/airtime.ini

diff --git a/installer/install.sh b/installer/install
similarity index 91%
rename from installer/install.sh
rename to installer/install
index adc973a89..72e00569a 100644
--- a/installer/install.sh
+++ b/installer/install
@@ -7,12 +7,6 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
 fi
 
-#Current dir
-# Absolute path to this script, e.g. /home/user/bin/foo.sh
-SCRIPT=`readlink -f $0`
-# Absolute path this script is in, thus /home/user/bin
-SCRIPTPATH=`dirname ${SCRIPT}`
-
 showhelp () {
     echo "Usage: airtime-install [options]
 --help|-h                         Displays usage information."
@@ -31,7 +25,9 @@ do
     shift
 done
 
-echo -e "                 \n****************************************************************"
+dist=`lsb_release -is`
+
+echo -e "\n               ****************************************************************"
 echo    "                 *    _____  .________________________.___   _____  ___________ *"
 echo    "                 *   /  _  \ |   \______   \__    ___/|   | /     \ \_   _____/ *"
 echo    "                 *  /  /_\  \|   ||       _/ |    |   |   |/  \ /  \ |    __)_  *"
@@ -72,7 +68,7 @@ fi
 if [ ! -f /etc/apache2/sites-available/${airtimeconfigfile} ]; then
     echo "Creating Apache config for Airtime..."
 
-    cp ${SCRIPTPATH}/../apache/airtime-vhost /etc/apache2/sites-available/${airtimeconfigfile}
+    cp apache/airtime-vhost /etc/apache2/sites-available/${airtimeconfigfile}
     a2dissite 000-default
     a2ensite airtime
 else
@@ -89,7 +85,7 @@ fi
 # PHP Config File for Apache
 if [ ! -f /etc/php5/apache2/airtime.ini ]; then
     echo "Creating Airtime PHP config for Apache..."
-    cp ${SCRIPTPATH}/../php5/airtime.ini /etc/php5/apache2/conf.d/airtime.ini
+    cp php/airtime.ini /etc/php5/apache2/conf.d/airtime.ini
 else
     echo "Airtime PHP config for Apache already exists, skipping"
 fi
diff --git a/installer/php/airtime.ini b/installer/php/airtime.ini
new file mode 100644
index 000000000..829e5edd0
--- /dev/null
+++ b/installer/php/airtime.ini
@@ -0,0 +1,8 @@
+[PHP]
+memory_limit = 512M
+magic_quotes_gpc = Off
+file_uploads = On
+upload_tmp_dir = /tmp
+apc.write_lock = 1
+apc.slam_defense = 0
+