# HG changeset patch # User Chris Cannam # Date 1503581186 -3600 # Node ID b22e234c3c7b4907d464c4a3d4170c924a9cc5ba # Parent 07deb8466f6514206ab32e40d6207ea03722f28f Install (but don't use) ssl version diff -r 07deb8466f65 -r b22e234c3c7b deploy/provision.d/100-apache-config.sh --- 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