Merge pull request #489 from waynestate/develop

Fix for ppa:ondrej/apache2 and apache2-mpm-event conflicting

scripts/apache.sh

@@ -38,19 +38,19 @@ sudo apt-get update
 
 # Install Apache
 # -qq implies -y --force-yes
-sudo apt-get install -qq apache2 apache2-mpm-event
+sudo apt-get install -qq apache2
 
 echo ">>> Configuring Apache"
 
 # Add vagrant user to www-data group
 sudo usermod -a -G www-data vagrant
 
 # Apache Config
-# On separate lines since some may cause an error 
+# On separate lines since some may cause an error
 # if not installed
-sudo a2dismod mpm_prefork
-sudo a2dismod php5 
-sudo a2enmod mpm_worker rewrite actions ssl
+sudo a2dismod mpm_prefork mpm_worker
+sudo a2dismod php5
+sudo a2enmod rewrite actions ssl
 curl --silent -L $github_url/helpers/vhost.sh > vhost
 sudo chmod guo+x vhost
 sudo mv vhost /usr/local/bin