BBlack has submitted this change and it was merged.
Change subject: Make lists.wikimedia.org HTTPS only
......................................................................
Make lists.wikimedia.org HTTPS only
Bug: 68553
Change-Id: I3511f4b0d0185d1e4d35166c13f2104c7805f737
---
M files/lighttpd/50-mailman.conf
M manifests/role/mail.pp
2 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/lighttpd/50-mailman.conf b/files/lighttpd/50-mailman.conf
index 419b43e..30b94e9 100644
--- a/files/lighttpd/50-mailman.conf
+++ b/files/lighttpd/50-mailman.conf
@@ -24,9 +24,8 @@
$SERVER["socket"] == ":80" {
url.redirect = (
- "^/(index\.html?)?$" =>
"https://lists.wikimedia.org/mailman/listinfo";,
- "^/mailman/?$" => "/mailman/listinfo",
- "^/mailman/(.*)" => "https://lists.wikimedia.org/mailman/$1"; )
+ "^/(.*)" => "https://lists.wikimedia.org/$1";
+ )
}
$SERVER["socket"] == ":443" {
@@ -39,15 +38,15 @@
url.redirect = (
"^/(index\.html?)?$" =>
"https://lists.wikimedia.org/mailman/listinfo";,
- "^/mailman/?$" => "/mailman/listinfo",
+ "^/mailman/?$" =>
"https://lists.wikimedia.org/mailman/listinfo";,
"^/mailman/listinfo/foundation-l$" =>
"https://lists.wikimedia.org/mailman/listinfo/wikimedia-l";,
"^/mailman/listinfo/museum-l$" =>
"https://lists.wikimedia.org/mailman/listinfo/glam";,
"^/mailman/listinfo/mediawiki-cvs$" =>
"https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits";,
"^/mailman/listinfo/wsor$" =>
"https://lists.wikimedia.org/mailman/listinfo/wmfresearch";,
"^/mailman/listinfo/chaptercommittee-l$" =>
"https://lists.wikimedia.org/mailman/listinfo/affcom";,
"^/mailman/listinfo/allhands$" =>
"https://lists.wikimedia.org/mailman/listinfo/wmfreqs";,
- "^/mailman/listinfo/research-team$" =>
"https://lists.wikimedia.org/mailman/listinfo/research-internal";,
- "^/(pipermail)/(.*)" => "http://lists.wikimedia.org/$1/$2"; )
+ "^/mailman/listinfo/research-team$" =>
"https://lists.wikimedia.org/mailman/listinfo/research-internal";,
+ )
}
# Private list configuration
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index aa664ab..b174877 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -156,7 +156,7 @@
monitor_service { 'mailman_archives':
description => 'mailman archives',
- check_command =>
'check_http_url_for_string!lists.wikimedia.org!/pipermail/wikimedia-l/!\'The
Wikimedia-l Archives\'',
+ check_command =>
'check_https_url_for_string!lists.wikimedia.org!/pipermail/wikimedia-l/!\'The
Wikimedia-l Archives\'',
}
monitor_service { 'mailman_queue':
--
To view, visit https://gerrit.wikimedia.org/r/145616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3511f4b0d0185d1e4d35166c13f2104c7805f737
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: JanZerebecki <[email protected]>
Gerrit-Reviewer: BBlack <[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: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Thehelpfulone <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
