Ori.livneh has submitted this change and it was merged.
Change subject: Fix w-beta.wmflabs.org redirect
......................................................................
Fix w-beta.wmflabs.org redirect
Bug: T116444
Change-Id: I73e68fae54f492cd59230d4dc0036ff155fc88bf
---
M modules/mediawiki/files/apache/beta/sites/main.conf
M modules/mediawiki/manifests/web/beta_sites.pp
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/beta/sites/main.conf
b/modules/mediawiki/files/apache/beta/sites/main.conf
index e10e8b8..dae2c97 100644
--- a/modules/mediawiki/files/apache/beta/sites/main.conf
+++ b/modules/mediawiki/files/apache/beta/sites/main.conf
@@ -23,6 +23,7 @@
ServerName w-beta.wmflabs.org
Redirect / http://meta.wikimedia.beta.wmflabs.org/wiki/Special:UrlShortener
- RewriteEngine On
- RewriteRule ^/(.+)$
meta.wikimedia.beta.wmflabs.org/w/index.php?title=Special:UrlRedirector/$1 [PT]
+ <Location "/">
+ ProxyPass
"http://meta.wikimedia.beta.wmflabs.org/wiki/Special:UrlRedirector/";
+ </Location>
</VirtualHost>
diff --git a/modules/mediawiki/manifests/web/beta_sites.pp
b/modules/mediawiki/manifests/web/beta_sites.pp
index 300d733..b9e1ea0 100644
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ b/modules/mediawiki/manifests/web/beta_sites.pp
@@ -11,6 +11,8 @@
priority => 0,
}
+ # w-beta.wmflabs.org depends on proxy_http
+ include ::apache::mod::proxy_http
apache::site { 'main':
source => 'puppet:///modules/mediawiki/apache/beta/sites/main.conf',
priority => 1,
--
To view, visit https://gerrit.wikimedia.org/r/248617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73e68fae54f492cd59230d4dc0036ff155fc88bf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
