Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185183
Change subject: mailman: fix $ssl_settings for Apache
......................................................................
mailman: fix $ssl_settings for Apache
Change-Id: I31cca5c61a82bcce791f1f90e8ba3f86d823903f
---
M manifests/mail.pp
M templates/apache/sites/lists.wikimedia.org.erb
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/185183/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index eda7dd6..dd8eae0 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -211,6 +211,8 @@
require => Class['apache'],
}
+ $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat', '365')
+
apache::site { 'lists.wikimedia.org':
content => template('apache/sites/lists.wikimedia.org.erb'),
}
diff --git a/templates/apache/sites/lists.wikimedia.org.erb
b/templates/apache/sites/lists.wikimedia.org.erb
index 61cc9f2..bd30809 100644
--- a/templates/apache/sites/lists.wikimedia.org.erb
+++ b/templates/apache/sites/lists.wikimedia.org.erb
@@ -15,7 +15,6 @@
SSLCertificateKeyFile /etc/ssl/private/lists.wikimedia.org.key
SSLCACertificatePath /etc/ssl/certs
<%= @ssl_settings.join("\n") %>
- Header set Strict-Transport-Security "max-age=31536000"
# Does not obey robots.txt; causing operational issues, 2014-06-23
BrowserMatch "ArchiveTeam ArchiveBot" bad_browser
--
To view, visit https://gerrit.wikimedia.org/r/185183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I31cca5c61a82bcce791f1f90e8ba3f86d823903f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
