Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322417
Change subject: beta: configure loginwiki the same as prod
......................................................................
beta: configure loginwiki the same as prod
Change-Id: I7ead6cc849234ffce452ab785a19c949cff837bd
---
D modules/mediawiki/files/apache/beta/sites/loginwiki.conf
M modules/mediawiki/files/apache/beta/sites/wikimedia.conf
M modules/mediawiki/manifests/web/beta_sites.pp
3 files changed, 5 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/322417/1
diff --git a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
b/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
deleted file mode 100644
index 4782c91..0000000
--- a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-<VirtualHost *:80>
- ServerName login.wikimedia.beta.wmflabs.org
- DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
-
- AllowEncodedSlashes On
- RewriteEngine On
-
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php [P]
-
- #RewriteCond %{HTTP:X-Forwarded-Proto} !https
- #RewriteRule ^/(.*)$ https://login.wikimedia.beta.wmflabs.org/$1 [R=301,L]
-
- # Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
- RewriteRule ^/$ /w/index.php
-
-</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
index 3634994..b044345 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
@@ -1,4 +1,9 @@
<VirtualHost *:80>
+ ServerName login.wikimedia.beta.wmflabs.org
+ Include "sites-enabled/wikimedia-common.incl"
+</VirtualHost>
+
+<VirtualHost *:80>
ServerName zero.wikimedia.beta.wmflabs.org
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
diff --git a/modules/mediawiki/manifests/web/beta_sites.pp
b/modules/mediawiki/manifests/web/beta_sites.pp
index e18ff3a..c2a031f 100644
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ b/modules/mediawiki/manifests/web/beta_sites.pp
@@ -57,11 +57,6 @@
priority => 11,
}
- apache::site { 'loginwiki':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/loginwiki.conf',
- priority => 12,
- }
-
apache::site { 'wikimedia':
source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikimedia.conf',
priority => 16,
--
To view, visit https://gerrit.wikimedia.org/r/322417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ead6cc849234ffce452ab785a19c949cff837bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
