Dzahn has submitted this change and it was merged.
Change subject: subversion - use ssl_ciphersuite
......................................................................
subversion - 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: I15fecb7db3f2fd05e4fbfedb01cf3aaaf99028cf
---
M manifests/role/subversion.pp
M modules/subversion/templates/apache/svn.wikimedia.org.erb
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/subversion.pp b/manifests/role/subversion.pp
index 5a91f0f..c25f70d 100644
--- a/manifests/role/subversion.pp
+++ b/manifests/role/subversion.pp
@@ -7,6 +7,8 @@
}
$svnhost = 'svn.wikimedia.org'
+ $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
+
class { '::subversion':
host => $svnhost,
}
diff --git a/modules/subversion/templates/apache/svn.wikimedia.org.erb
b/modules/subversion/templates/apache/svn.wikimedia.org.erb
index 90795e5..e2d7bfb 100644
--- a/modules/subversion/templates/apache/svn.wikimedia.org.erb
+++ b/modules/subversion/templates/apache/svn.wikimedia.org.erb
@@ -50,13 +50,10 @@
DocumentRoot /srv/org/wikimedia/svn
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/svn.wikimedia.org.pem
SSLCertificateKeyFile /etc/ssl/private/svn.wikimedia.org.key
SSLCACertificatePath /etc/ssl/certs/
-
+ <%= @ssl_settings.join("\n") %>
<Location />
# Some annoying bots that have slowed things down in the past
--
To view, visit https://gerrit.wikimedia.org/r/153991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15fecb7db3f2fd05e4fbfedb01cf3aaaf99028cf
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Chmarkine <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Greg Grossmeier <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
