Merge remote-tracking branch 'remotes/origin/master' into ansible-realserver

Author: quentinmit

ansible/roles/real-httpd/files/httpd/conf/httpd.conf

@@ -273,13 +273,6 @@ ProxyRequests Off
     ErrorDocument 404 "No favicon.ico.
 </Location>
 
-<VirtualHost 18.4.86.50:80>
-    ServerName scripts-cert.mit.edu
-    ServerAlias scripts-cert
-    Include conf.d/scripts-vhost.conf
-    Include conf.d/vhosts-common.conf
-</VirtualHost>
-
 # LDAP vhost, w00t w00t
 <VirtualHost *:80>
     ServerName localhost
@@ -293,6 +286,14 @@ ProxyRequests Off
     Include conf.d/vhosts-common.conf
 </VirtualHost>
 
+# scripts-cert.mit.edu; must be listed below the default vhost
+<VirtualHost 18.4.86.50:80 *:80>
+    ServerName scripts-cert.mit.edu
+    ServerAlias scripts-cert
+    Include conf.d/scripts-vhost.conf
+    Include conf.d/vhosts-common.conf
+</VirtualHost>
+
 <IfModule ssl_module>
 <ifFile /etc/pki/tls/private/scripts-2048.key>
     Listen 443
@@ -322,15 +323,6 @@ ProxyRequests Off
     SSLHonorCipherOrder on
     SSLCompression off
 
-    <VirtualHost 18.4.86.50:443 18.4.86.50:444>
-        ServerName scripts-cert.mit.edu
-        ServerAlias scripts-cert
-        Include conf.d/scripts-vhost.conf
-        Include conf.d/vhosts-common-ssl.conf
-        SSLCertificateFile /etc/pki/tls/certs/scripts-cert.pem
-        SSLCertificateKeyFile /etc/pki/tls/private/scripts-2048.key
-        Include conf.d/vhosts-common-ssl-cert.conf
-    </VirtualHost>
     <VirtualHost 18.4.86.43:443>
         Include conf.d/scripts-vhost-names.conf
         Include conf.d/scripts-vhost.conf
@@ -378,6 +370,16 @@ ProxyRequests Off
         Include conf.d/vhosts-common-ssl.conf
         Include conf.d/vhosts-common-ssl-cert.conf
     </VirtualHost>
+    # scripts-cert.mit.edu; must be listed below the default vhost
+    <VirtualHost 18.4.86.50:443 18.4.86.50:444 *:443 *:444>
+        ServerName scripts-cert.mit.edu
+        ServerAlias scripts-cert
+        Include conf.d/scripts-vhost.conf
+        Include conf.d/vhosts-common-ssl.conf
+        SSLCertificateFile /etc/pki/tls/certs/scripts-cert.pem
+        SSLCertificateKeyFile /etc/pki/tls/private/scripts-2048.key
+        Include conf.d/vhosts-common-ssl-cert.conf
+    </VirtualHost>
     Include /var/lib/scripts-certs/vhosts.conf
 </IfFile>
 </IfModule>