Dzahn has submitted this change and it was merged.
Change subject: rt - use ssl_ciphersuite
......................................................................
rt - use ssl_ciphersuite
In the past, when we changed SSL cipher settings
we had to create many changes, usually one per service.
Then Giuseppe introduced ssl_ciphersuite in I9bc1104b7f770d9
which moves the settings into a centralized function.
This change makes it actually use the new function.
One last time we are going through all of the services,
but in the future we will be able make a single change
to update ciphers across misc. services.
Change-Id: I81a36d45c1f0ec8b5e765ef7ea2f7d3d41e065bf
---
M manifests/role/rt.pp
M templates/rt/rt4.apache.erb
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Chmarkine: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/rt.pp b/manifests/role/rt.pp
index 373a983..1f8b0da 100644
--- a/manifests/role/rt.pp
+++ b/manifests/role/rt.pp
@@ -6,6 +6,8 @@
install_certificate { 'rt.wikimedia.org': }
+ $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
+
class { 'misc::rt':
site => 'rt.wikimedia.org',
dbhost => 'db1001.eqiad.wmnet',
diff --git a/templates/rt/rt4.apache.erb b/templates/rt/rt4.apache.erb
index 09bbb4e..e14bbcf 100644
--- a/templates/rt/rt4.apache.erb
+++ b/templates/rt/rt4.apache.erb
@@ -14,12 +14,10 @@
ServerName <%=@site%>
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/rt.wikimedia.org.pem
SSLCertificateKeyFile /etc/ssl/private/rt.wikimedia.org.key
SSLCACertificatePath /etc/ssl/certs
+ <%= @ssl_settings.join("\n") %>
AddDefaultCharset UTF-8
--
To view, visit https://gerrit.wikimedia.org/r/153981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81a36d45c1f0ec8b5e765ef7ea2f7d3d41e065bf
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Chmarkine <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
