Ubuntu Trusty uses Apache 2.4, thus, the name of default vhosts have changed

Adjust scripts to modify default-ssl.conf, not the old 2.2 default-ssl vhost
file now that we are using Apache 2.4.  Also use 000-default.conf to comply.

Signed-off-by: Andy Witter <awitter@georgialibraries.org>

diff --git a/templates/setup-functions b/templates/setup-functions
index 6f94f06..8dfb33a 100644 (file)
--- a/templates/setup-functions
+++ b/templates/setup-functions
@@ -75,16 +75,16 @@ openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
 cd $WD
 }
 
-Config_Apache2_Default_SSL () { ### configure Apache2 default-ssl vhost for our certs.
+Config_Apache2_Default_SSL () { ### configure Apache 2.4 default-ssl.conf vhost for our certs.
 if [ -e /etc/apache2/sites-available/default-ssl ]
 then
-       sed -i 's^SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem^SSLCertificateFile ssl/server.crt^g' /etc/apache2/sites-available/default-ssl
-       sed -i 's^SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key^SSLCertificateFile ssl/server.key^g' /etc/apache2/sites-available/default-ssl
-       [ -e /etc/apache2/ssl/ca.crt ] && sed -i '/SSLCertificateKeyFile/ a\ \tSSLCACertificateFile ssl/ca.crt' /etc/apache2/sites-available/default-ssl #insert after match.
+       sed -i 's^SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem^SSLCertificateFile ssl/server.crt^g' /etc/apache2/sites-available/default-ssl.conf
+       sed -i 's^SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key^SSLCertificateFile ssl/server.key^g' /etc/apache2/sites-available/default-ssl.conf
+       [ -e /etc/apache2/ssl/ca.crt ] && sed -i '/SSLCertificateKeyFile/ a\ \tSSLCACertificateFile ssl/ca.crt' /etc/apache2/sites-available/default-ssl.conf #insert after match.
 else
-       echo;echo "/etc/apache2/sites-available/default-ssl not found.."
-       echo "Cannot configure Apache2 default-ssl vhost for your SSL"
-       echo "certificates in /etc/apache2/sites-available/default-ssl"
+       echo;echo "/etc/apache2/sites-available/default-ssl.conf not found.."
+       echo "Cannot configure Apache2 default-ssl.conf vhost for your SSL"
+       echo "certificates in /etc/apache2/sites-available/default-ssl.conf"
        echo "You will have to do this manually."
        read -p "Press [Enter] to continue."
 fi

diff --git a/templates/setup-head.sh b/templates/setup-head.sh
index 653a6be..83f76e2 100755 (executable)
--- a/templates/setup-head.sh
+++ b/templates/setup-head.sh
@@ -165,9 +165,9 @@ a2enmod proxy_http
 a2enmod rewrite
 a2enmod deflate
 
-if [ -e /etc/apache2/sites-enabled/000-default ]
+if [ -e /etc/apache2/sites-enabled/000-default.conf ]
        then 
-       rm /etc/apache2/sites-enabled/000-default
+       rm /etc/apache2/sites-enabled/000-default.conf
 fi
 sed -i 's^NameVirtualHost^#NameVirtualHost^g' /etc/apache2/ports.conf
 

diff --git a/templates/setup.sh b/templates/setup.sh
index 31104f0..2ba4c1a 100755 (executable)
--- a/templates/setup.sh
+++ b/templates/setup.sh
@@ -639,17 +639,17 @@ then
        echo -e "directive has the correct ethernet inteface"
        echo -e "for the *PRIVATE* network."  $COL_RESET
        ### Configure apache for lvs servers.
-        if [ -e "/etc/apache2/sites-available/default-ssl" ]
+        if [ -e "/etc/apache2/sites-available/default-ssl.conf" ]
         then
                 Config_Apache2_Default_SSL
-                a2ensite default-ssl
+                a2ensite default-ssl.conf
         else
                 echo;echo "Apache2 not installed yet"
                 echo "installing Apache2..."
                sleep 1
                 apt-get install apache2 openssl
                 Config_Apache2_Default_SSL
-                a2ensite default-ssl
+                a2ensite default-ssl.conf
         fi
 fi