Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x

install_full/ubuntu/airtime-full-install

@@ -39,7 +39,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
 libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
 libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
 php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
-libvorbis-ocaml libpulse0
+libvorbis-ocaml libpulse0 vorbis-tools
 
 #install packages with --force-yes option (this is useful in the case
 #of Debian, where these packages are unauthorized)
@@ -61,7 +61,7 @@ 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 
+	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
 	a2enmod rewrite php5
@@ -90,7 +90,7 @@ grep -q "include /etc/monit/conf.d" /etc/monit/monitrc
 RETVAL=$?
 if [ $RETVAL -ne 0 ] ; then
     mkdir -p /etc/monit/conf.d
-    echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc 
+    echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc
 fi
 
 # Run Airtime Install

install_full/ubuntu/airtime-full-install-nginx

@@ -0,0 +1,115 @@
+#!/bin/bash
+#
+# Auto install script for airtime on Ubuntu
+#
+# NGINX changes are contributed by Eugene MechanisM
+# 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 2>&1
+
+if [ "$(id -u)" != "0" ]; then
+    echo "Please run as root user."
+	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`
+
+#Prerequisite
+echo "----------------------------------------------------"
+echo " 1. Install Packages"
+echo "----------------------------------------------------"
+
+dist=`lsb_release -is`
+
+if [ "$dist" -eq "Debian" ]; then
+    grep "deb http://www.debian-multimedia.org squeeze main non-free" /etc/apt/sources.list
+    if [ "$?" -ne "0" ]; then
+        echo "deb http://www.debian-multimedia.org squeeze main non-free" >> /etc/apt/sources.list
+    fi
+fi
+
+apt-get update
+
+# Updated package list
+apt-get -y install tar gzip curl nginx php5-pgsql php5-fpm \
+php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
+libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
+libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
+php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
+libvorbis-ocaml libpulse0 vorbis-tools
+
+#install packages with --force-yes option (this is useful in the case
+#of Debian, where these packages are unauthorized)
+apt-get -y --force-yes install libmp3lame-dev lame icecast2
+
+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
+
+# Install phing
+pear channel-discover pear.phing.info
+pear install phing/phing-2.4.2
+
+# NGINX Config File
+echo "----------------------------------------------------"
+echo "2.1 NGINX Config File"
+echo "----------------------------------------------------"
+if [ ! -f /etc/nginx/sites-available/airtime ]; then
+	cp $SCRIPTPATH/../nginx/airtime-vhost /etc/nginx/sites-available/airtime 
+	ln -s /etc/nginx/sites-available/airtime /etc/nginx/sites-enabled/airtime
+	service nginx reload
+else
+	echo "NGINX config for Airtime already exists..."
+fi
+
+# php-fpm Airtime pool file
+echo "----------------------------------------------------"
+echo "2.2 Airtime php pool file"
+echo "----------------------------------------------------"
+if [ ! -f /etc/php5/fpm/pool.d/airtime.conf ]; then
+	cp $SCRIPTPATH/../php5-fpm/airtime.conf /etc/php5/fpm/pool.d/airtime.conf 
+	service php5-fpm reload
+else
+	echo "Airtime php pool file already exists..."
+fi
+
+# Enable Icecast
+echo "----------------------------------------------------"
+echo "3. Enable Icecast"
+echo "----------------------------------------------------"
+cd /etc/default/
+sed -i 's/ENABLE=false/ENABLE=true/g' icecast2
+service icecast2 start
+echo ""
+
+# Enable Monit
+echo "----------------------------------------------------"
+echo "4. Enable Monit"
+echo "----------------------------------------------------"
+cd /etc/default/
+sed -i 's/startup=0/startup=1/g' monit
+
+grep -q "include /etc/monit/conf.d" /etc/monit/monitrc
+RETVAL=$?
+if [ $RETVAL -ne 0 ] ; then
+    mkdir -p /etc/monit/conf.d
+    echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc 
+fi
+
+# Run Airtime Install
+echo "----------------------------------------------------"
+echo "5. Run Airtime Install"
+echo "----------------------------------------------------"
+cd $SCRIPTPATH/../../install_minimal
+./airtime-install
+
+