diff --git a/install_minimal/apache/airtime-vhost b/install_full/apache/airtime-vhost similarity index 100% rename from install_minimal/apache/airtime-vhost rename to install_full/apache/airtime-vhost diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index 2959204b7..81221a39c 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -21,7 +21,7 @@ echo " 1. Install Packages" echo "----------------------------------------------------" # Updated package list -sudo apt-get install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \ +sudo apt-get -y install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \ php-pear php5-gd postgresql odbc-postgresql python2.6 lame libsoundtouch-ocaml \ libvorbis-ocaml-dev libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml \ libesd0 icecast2 sudo libportaudio2 libsamplerate0 libcamomile-ocaml-dev \ @@ -36,20 +36,7 @@ echo "----------------------------------------------------" echo "2. Apache Config File" echo "----------------------------------------------------" if [ ! -f /etc/apache2/sites-available/airtime ]; then - cd /etc/apache2/sites-available/ - sudo touch airtime - echo " - ServerAdmin foo@bar.org - DocumentRoot /var/www/airtime/public - - - DirectoryIndex index.php - AllowOverride all - Order allow,deny - Allow from all - - " | sudo tee -a airtime - + sudo cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime sudo rm /etc/apache2/sites-enabled/000-default sudo ln -s /etc/apache2/sites-available/airtime /etc/apache2/sites-enabled/airtime sudo a2enmod rewrite php5 diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 451da2177..f86f04a82 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -11,7 +11,7 @@ else fi echo -e "\n*** Installing Python Libraries ***" -sudo /usr/lib/airtime/airtime_virtualenv/bin/pip install kombu poster pyinotify==0.9.2 mutagen==1.20 configobj -E /usr/lib/airtime/airtime_virtualenv +sudo /usr/lib/airtime/airtime_virtualenv/bin/pip install airtime_virtual_env.pybundle -E /usr/lib/airtime/airtime_virtualenv virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" . ${virtualenv_bin}activate diff --git a/install_minimal/airtime_virtual_env.pybundle b/install_minimal/airtime_virtual_env.pybundle new file mode 100644 index 000000000..2cd60676e Binary files /dev/null and b/install_minimal/airtime_virtual_env.pybundle differ