changeset 1602:b22e234c3c7b deploy

Install (but don't use) ssl version
author Chris Cannam
date Thu, 24 Aug 2017 14:26:26 +0100
parents 07deb8466f65
children 455ca6e45c49
files deploy/provision.d/100-apache-config.sh
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/provision.d/100-apache-config.sh	Thu Aug 24 14:25:03 2017 +0100
+++ b/deploy/provision.d/100-apache-config.sh	Thu Aug 24 14:26:26 2017 +0100
@@ -6,10 +6,11 @@
 
 cd /var/www/code
 
-codeconffile=/var/www/code/deploy/config/code.conf.gen
+codeconf=/var/www/code/deploy/config/code.conf.gen
+codeconfssl=/var/www/code/deploy/config/code-ssl.conf.gen
 
-if [ ! -f "$codeconffile" ]; then
-    echo "ERROR: Apache config file $codeconffile not found - has the database secret been interpolated from its input file correctly?"
+if [ ! -f "$codeconf" ]; then
+    echo "ERROR: Apache config file $codeconf not found - has the database secret been interpolated from its input file correctly?"
     exit 2
 fi
 
@@ -28,7 +29,8 @@
     ln -s ../mods-available/rewrite.load    /etc/apache2/mods-enabled/
     ln -s ../mods-available/cgi.load        /etc/apache2/mods-enabled/
 
-    cp "$codeconffile" /etc/apache2/sites-available/code.conf
+    cp "$codeconf" /etc/apache2/sites-available/code.conf
+    cp "$codeconfssl" /etc/apache2/sites-available/code-ssl.conf
     ln -s ../sites-available/code.conf /etc/apache2/sites-enabled/10-code.conf
 
     apache2ctl configtest