Dzahn has submitted this change and it was merged.
Change subject: racktables - use ssl_ciphersuite
......................................................................
racktables - 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: I2224efd19d43c0fa467493187a93921b9c026e7c
---
M manifests/role/racktables.pp
M templates/apache/sites/racktables.wikimedia.org.erb
2 files changed, 2 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/racktables.pp b/manifests/role/racktables.pp
index 05dd313..ffe906f 100644
--- a/manifests/role/racktables.pp
+++ b/manifests/role/racktables.pp
@@ -36,6 +36,7 @@
}
}
+ $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
apache::site { 'racktables.wikimedia.org':
content => template('apache/sites/racktables.wikimedia.org.erb'),
diff --git a/templates/apache/sites/racktables.wikimedia.org.erb
b/templates/apache/sites/racktables.wikimedia.org.erb
index 5d0d4f6..895072f 100644
--- a/templates/apache/sites/racktables.wikimedia.org.erb
+++ b/templates/apache/sites/racktables.wikimedia.org.erb
@@ -18,12 +18,10 @@
ServerName <%= @racktables_host %>
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 <%= @racktables_ssl_cert %>
SSLCertificateKeyFile <%= @racktables_ssl_key %>
SSLCACertificatePath /etc/ssl/certs
+ <%= @ssl_settings.join("\n") %>
DocumentRoot /srv/org/wikimedia/racktables/wwwroot
<Directory />
--
To view, visit https://gerrit.wikimedia.org/r/153973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2224efd19d43c0fa467493187a93921b9c026e7c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Chmarkine <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
