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

Changed tabs to spaces and moved apache2 version call to after installation

This commit is contained in:
Duncan Sommerville 2014-11-05 14:35:19 -05:00
parent e843d96e3f
commit 79548c9e83
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install_full/ubuntu/airtime-full-install
View File

@ -29,10 +29,6 @@ echo "----------------------------------------------------"
dist=`lsb_release -is` dist=`lsb_release -is`
code=`lsb_release -cs` code=`lsb_release -cs`
set +e
apache2 -v | grep "2\.4" > /dev/null
apacheversion=$?
set -e
#enable squeeze backports to get lame packages #enable squeeze backports to get lame packages
if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then
@ -130,6 +126,12 @@ if [ "$server" = "nginx" ]; then
fi fi
else else
apt-get -y --force-yes install apache2 libapache2-mod-php5 apt-get -y --force-yes install apache2 libapache2-mod-php5
set +e
apache2 -v | grep "2\.4" > /dev/null
apacheversion=$?
set -e
# Apache Config File # Apache Config File
echo "----------------------------------------------------" echo "----------------------------------------------------"
echo "2.1 Apache Config File" echo "2.1 Apache Config File"