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

-clean up full_install scripts

Browse source
This commit is contained in:
Martin Konecny 2012-05-08 20:54:10 -04:00
parent 6c4bb1ef9e
commit a5ec83ebbd
2 changed files with 9 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash -e
# #
# Auto install script for airtime on Ubuntu # Auto install script for airtime on Ubuntu
# #
exec > >(tee install_log.txt) exec >> (tee install_log.txt)
exec 2>&1 exec 2>&1
if [ "$(id -u)" != "0" ]; then if [ "$(id -u)" != "0" ]; then
@ -55,25 +55,16 @@ else
apt-get -y install libzend-framework-php apt-get -y install libzend-framework-php
fi 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 # Apache Config File
echo "----------------------------------------------------" echo "----------------------------------------------------"
echo "2. Apache Config File" echo "2. Apache Config File"
echo "----------------------------------------------------" echo "----------------------------------------------------"
if [ ! -f /etc/apache2/sites-available/airtime ]; then 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 a2dissite default
ln -s /etc/apache2/sites-available/airtime /etc/apache2/sites-enabled/airtime a2ensite airtime
a2enmod rewrite php5 a2enmod rewrite php5
service apache2 restart service apache2 reload
else else
echo "Apache config for Airtime already exists..." echo "Apache config for Airtime already exists..."
fi fi
@ -107,5 +98,3 @@ echo "5. Run Airtime Install"
echo "----------------------------------------------------" echo "----------------------------------------------------"
cd $SCRIPTPATH/../../install_minimal cd $SCRIPTPATH/../../install_minimal
./airtime-install ./airtime-install

12
install_full/ubuntu/airtime-full-install-nginx
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -e
# #
# Auto install script for airtime on Ubuntu # Auto install script for airtime on Ubuntu
# #
@ -6,7 +6,7 @@
# Link to the post: # Link to the post:
# http://forum.sourcefabric.org/discussion/13563/first-step-to-run-airtime-via-nginx-based-on-airtime-2.0-beta-files # 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 exec 2>&1
if [ "$(id -u)" != "0" ]; then if [ "$(id -u)" != "0" ]; then
@ -57,14 +57,6 @@ else
apt-get -y install libzend-framework-php apt-get -y install libzend-framework-php
fi 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 # NGINX Config File
echo "----------------------------------------------------" echo "----------------------------------------------------"
echo "2.1 NGINX Config File" echo "2.1 NGINX Config File"