Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-2592: Full install issues running twice in a row

Browse source 
- use "rm -rf" instead of "rm" when deleting
/etc/apache2/sites-enabled/000-default

- append "include /etc/monit/conf.d/*" to /etc/monit/monitrc if
it's first time installing it.

- bypass python lib installation and patching if virtualenv
already exists
This commit is contained in:
James 2011-07-26 12:05:36 -04:00
parent d94357e5e5
commit 86ca2c7fc4
2 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
install_full/ubuntu/airtime-full-install
View file

@ -44,7 +44,7 @@ echo "2. Apache Config File"
echo "----------------------------------------------------"
if [ ! -f /etc/apache2/sites-available/airtime ]; then
sudo cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime
sudo rm /etc/apache2/sites-enabled/000-default
sudo rm -rf /etc/apache2/sites-enabled/000-default
sudo ln -s /etc/apache2/sites-available/airtime /etc/apache2/sites-enabled/airtime
sudo a2enmod rewrite php5
sudo service apache2 restart
@ -68,6 +68,13 @@ echo "----------------------------------------------------"
cd /etc/default/
sudo sed -i 's/startup=0/startup=1/g' monit
sudo cp $SCRIPTPATH/../../python_apps/monit/airtime-monit.cfg /etc/monit/conf.d
grep -q "include /etc/monit/conf.d" /etc/monit/monitrc
RETVAL=$?
if [ $RETVAL -ne 0 ] ; then
sudo echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc
fi
sudo service monit start
# Run Airtime Install