Changed order of deb installation moving opensrf deb to the last installed deb and...

diff --git a/templates/setup-functions b/templates/setup-functions
index 2d7bb7b..ee39713 100644 (file)
--- a/templates/setup-functions
+++ b/templates/setup-functions
@@ -51,10 +51,6 @@ if apt-get update
        gdebi --n bower*.deb
        gdebi --n grunt*.deb
 
-       echo
-       echo "Installing OpenSRF:";sleep 2
-       gdebi --n opensrf*.deb
-       
         echo                                                                                                                                 
         echo "Installing Dependencies for Apache Web Sockets for web based staff client";sleep 2
        gdebi --n libapache2-mod-websocket*.deb
@@ -82,6 +78,11 @@ EOF
        fi
        a2dismod websocket
        update-rc.d apache2-websockets defaults
+
+       echo 
+       echo "Installing OpenSRF:";sleep 2
+       gdebi --n opensrf*.deb
+
        service apache2-websockets start
        
        echo
@@ -114,6 +115,7 @@ then
        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.
+       [ ! -e /etc/apache2/ssl/ca.crt ] && sed -i 's^SSLCACertificateFile ssl/ca.crt^#SSLCACertificateFile ssl/ca.crt^g' /etc/apache2/sites-available/eg.conf
 else
        echo;echo "/etc/apache2/sites-available/default-ssl.conf not found.."
        echo "Cannot configure Apache2 default-ssl.conf vhost for your SSL"