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

Work on adding image upload to add-show form

Browse source
This commit is contained in:
Duncan Sommerville 2014-09-12 18:05:24 -04:00
parent cc3ddb40ea
commit cb80423fdd
8 changed files with 151 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,8 @@ echo "----------------------------------------------------"
dist=`lsb_release -is`
code=`lsb_release -cs`
apache2 -v | grep "2\.4" > /dev/null
apacheversion=$?
#enable squeeze backports to get lame packages
if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then
@ -130,16 +132,17 @@ else
echo "----------------------------------------------------"
echo "2.1 Apache Config File"
echo "----------------------------------------------------"
if [ ! -f /etc/apache2/sites-available/airtime ]; then
if [ "$apacheversion" != "1" ]; then
airtimeconfigfile="airtime.conf"
else
airtimeconfigfile="airtime"
fi
if [ ! -f /etc/apache2/sites-available/$airtimeconfigfile ]; then
echo "Creating Apache config for Airtime..."
if [ "$dist" = "Ubuntu" -a "$code" = "saucy" ]; then
cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime.conf
a2dissite 000-default
else
cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime
a2dissite default
fi
cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/$airtimeconfigfile
a2dissite 000-default
a2ensite airtime
else
echo "Apache config for Airtime already exists..."
@ -205,4 +208,4 @@ echo "----------------------------------------------------"
cd $SCRIPTPATH/../../install_minimal
# Restart apache to clear php cache
service apache2 restart
./airtime-install
./airtime-install