diff --git a/2017.pycon-au.org.conf b/2017.pycon-au.org.conf index 835d0761..b2ce7aa1 100644 --- a/2017.pycon-au.org.conf +++ b/2017.pycon-au.org.conf @@ -5,7 +5,15 @@ WSGIPythonPath /srv/http/uat.2017.pycon-au.org/symposion/website:/srv/http/uat.2 ServerName uat2017.pycon-au.org ServerAlias uat2017.pycon-au.org - Redirect "/" "https:/uat2017.pycon-au.org/" + # We need this bit of confignation when we generate site certs at sslforfree.com. + # So please don't get rid of it, and don't uncomment it unless you know wtf you're doing. + #Alias /.well-known/acme-challenge/ /srv/http/uat.2017.pycon-au.org/.well-known/acme-challenge/ + # + # Order allow,deny + # Allow from all + # + + Redirect permanent "/" "https:/uat2017.pycon-au.org/" ErrorLog /srv/http/uat.2017.pycon-au.org/log/error.log @@ -60,5 +68,6 @@ WSGIPythonPath /srv/http/uat.2017.pycon-au.org/symposion/website:/srv/http/uat.2 SSLEngine on SSLCertificateFile /srv/http/uat.2017.pycon-au.org/server.crt SSLCertificateKeyFile /srv/http/uat.2017.pycon-au.org/server.key + SSLCertificateChainFile /srv/http/uat.2017.pycon-au.org/CAbundle.pem