diff --git a/roles/websites/hatchlearningcenter.org/files/hatchlearningcenter.org.httpd.conf b/roles/websites/hatchlearningcenter.org/files/hatchlearningcenter.org.httpd.conf index 5e67d87..de9003b 100644 --- a/roles/websites/hatchlearningcenter.org/files/hatchlearningcenter.org.httpd.conf +++ b/roles/websites/hatchlearningcenter.org/files/hatchlearningcenter.org.httpd.conf @@ -1,4 +1,6 @@ # vim: set ft=apache sw=4 ts=4 sts=4 et : +MDomain hatchlearningcenter.org + ServerName hatchlearningcenter.org ServerAlias \ @@ -21,6 +23,7 @@ ServerName hatchlearningcenter.org ServerAlias \ + www.hatchlearningcenter.org \ hatchlearningcenter.com \ www.hatchlearningcenter.com \ hlcks.org \ @@ -34,31 +37,12 @@ Include conf.d/ssl.include - SSLCertificateFile /etc/pki/tls/certs/hatchlearningcenter.org.cer - SSLCertificateKeyFile /etc/pki/tls/private/hatchlearningcenter.org.key - SSLCertificateChainFile /etc/pki/tls/certs/hatchlearningcenter.org.cer - Header always set \ Strict-Transport-Security "max-age=63072000; includeSubDomains" RewriteEngine On + RewriteCond %{SERVER_NAME} !^www\.hatchlearningcenter\.org$ RewriteRule /.* https://www.hatchlearningcenter.org$0 [R=301,L] - - - - ServerName www.hatchlearningcenter.org - - Include conf.d/ssl.include - - SSLCertificateFile /etc/pki/tls/certs/hatchlearningcenter.org.cer - SSLCertificateKeyFile /etc/pki/tls/private/hatchlearningcenter.org.key - SSLCertificateChainFile /etc/pki/tls/certs/hatchlearningcenter.org.cer - - Header always set \ - Strict-Transport-Security "max-age=63072000; includeSubDomains" - - SSLProxyEngine On - RewriteEngine On DocumentRoot /srv/www/hatchlearningcenter.org/htdocs