Dzahn has submitted this change and it was merged.
Change subject: contacts.wm - remove SSL vhost,now behind varnish
......................................................................
contacts.wm - remove SSL vhost,now behind varnish
since I5f78ce2c95f77a1 & Ia87c36051af66
we put it behind misc. varnish.
which means we are only the backend and just talk http
varnish does the SSL and we don't the :443
virtual host anymore
Change-Id: If46f0d0eb7186fbf083b464b9eecef6c50a9134a
---
M files/apache/sites/contacts.wikimedia.org
1 file changed, 0 insertions(+), 15 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/files/apache/sites/contacts.wikimedia.org
b/files/apache/sites/contacts.wikimedia.org
index 2b826b9..6952dec 100644
--- a/files/apache/sites/contacts.wikimedia.org
+++ b/files/apache/sites/contacts.wikimedia.org
@@ -2,22 +2,7 @@
ServerAdmin [email protected]
ServerName contacts.wikimedia.org
- Redirect / https://contacts.wikimedia.org/
-
-</VirtualHost>
-
-<VirtualHost *:443>
- ServerAdmin [email protected]
- ServerName contacts.wikimedia.org
-
DocumentRoot /srv/org/wikimedia/contacts/
- SSLEngine On
- SSLProtocol +ALL -SSLv2
- SSLCipherSuite
ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA:AES128:AES256:RC4-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH
- SSLHonorCipherOrder on
- SSLCertificateFile /etc/ssl/certs/contacts.wikimedia.org.pem
- SSLCertificateKeyFile /etc/ssl/private/contacts.wikimedia.org.key
-
<Directory />
Options FollowSymLinks
--
To view, visit https://gerrit.wikimedia.org/r/148541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If46f0d0eb7186fbf083b464b9eecef6c50a9134a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
