Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153991
Change subject: subversion - use ssl_ciphersuite
......................................................................
subversion - use ssl_ciphersuite
Change-Id: I15fecb7db3f2fd05e4fbfedb01cf3aaaf99028cf
---
M manifests/role/subversion.pp
M modules/subversion/templates/apache/svn.wikimedia.org.erb
2 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/153991/1
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: newchange
Gerrit-Change-Id: I15fecb7db3f2fd05e4fbfedb01cf3aaaf99028cf
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
