Dzahn has submitted this change and it was merged.
Change subject: ganglia - use ssl_ciphersuite
......................................................................
ganglia - 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: I6691e2eac845682f9dd7edcb13be5074a66b8b42
---
M manifests/ganglia.pp
M templates/apache/sites/ganglia.wikimedia.org.erb
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index cd523f1..6d62ac9 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -469,6 +469,8 @@
$ganglia_ssl_cert = '/etc/ssl/certs/ganglia.wikimedia.org.pem'
$ganglia_ssl_key = '/etc/ssl/private/ganglia.wikimedia.org.key'
+
+ $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
}
apache::site { $ganglia_servername:
diff --git a/templates/apache/sites/ganglia.wikimedia.org.erb
b/templates/apache/sites/ganglia.wikimedia.org.erb
index 979c770..707ea78 100644
--- a/templates/apache/sites/ganglia.wikimedia.org.erb
+++ b/templates/apache/sites/ganglia.wikimedia.org.erb
@@ -26,11 +26,9 @@
ServerAdmin [email protected]
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 <%= @ganglia_ssl_cert %>
SSLCertificateKeyFile <%= @ganglia_ssl_key %>
+ <%= @ssl_settings.join("\n") %>
<Directory "/var/www">
Options FollowSymLinks
--
To view, visit https://gerrit.wikimedia.org/r/153972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6691e2eac845682f9dd7edcb13be5074a66b8b42
Gerrit-PatchSet: 3
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
