Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153976
Change subject: noc.wm.org - use ssl_ciphersuite
......................................................................
noc.wm.org - use ssl_ciphersuite
Change-Id: I3f18c59ffbf7b713996c0a19dcc0198d4bba3949
---
M manifests/misc/noc.pp
M templates/apache/sites/noc.wikimedia.org.erb
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/153976/1
diff --git a/manifests/misc/noc.pp b/manifests/misc/noc.pp
index a9aab87..4858e80 100644
--- a/manifests/misc/noc.pp
+++ b/manifests/misc/noc.pp
@@ -5,6 +5,8 @@
include ::apache
+ $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
+
apache::site { 'noc.wikimedia.org':
content => template('apache/sites/noc.wikimedia.org.erb'),
}
diff --git a/templates/apache/sites/noc.wikimedia.org.erb
b/templates/apache/sites/noc.wikimedia.org.erb
index 5666525..5cbf6ff 100644
--- a/templates/apache/sites/noc.wikimedia.org.erb
+++ b/templates/apache/sites/noc.wikimedia.org.erb
@@ -41,11 +41,9 @@
UserDir public_html
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/noc.wikimedia.org.pem
SSLCertificateKeyFile /etc/ssl/private/noc.wikimedia.org.key
+ <%= @ssl_settings.join("\n") %>
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
--
To view, visit https://gerrit.wikimedia.org/r/153976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f18c59ffbf7b713996c0a19dcc0198d4bba3949
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
