EddieGP has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398399 )
Change subject: beta: Combine meta & commons vhosts
......................................................................
beta: Combine meta & commons vhosts
These vhosts are 100% identical. The very only thing that differs is the
ServerName directive. That's what ServerAlias was invented for.
Change-Id: Ifdfb2efcf2ce5758cd47f62cb0d806da2b34a612
---
M modules/mediawiki/files/apache/beta/sites/remnant.conf
1 file changed, 2 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/398399/1
diff --git a/modules/mediawiki/files/apache/beta/sites/remnant.conf
b/modules/mediawiki/files/apache/beta/sites/remnant.conf
index 8f34539..0e7c172 100644
--- a/modules/mediawiki/files/apache/beta/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/beta/sites/remnant.conf
@@ -1,26 +1,7 @@
-# Commons
+# Commons & Meta
<VirtualHost *:80>
ServerName commons.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]
-
- # Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
- Include "sites-enabled/public-wiki-rewrites.incl"
-</VirtualHost>
-
-# Meta
-<VirtualHost *:80>
- ServerName meta.wikimedia.beta.wmflabs.org
+ ServerAlias meta.wikimedia.beta.wmflabs.org
DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
AllowEncodedSlashes On
--
To view, visit https://gerrit.wikimedia.org/r/398399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdfb2efcf2ce5758cd47f62cb0d806da2b34a612
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EddieGP <wikimedia....@eddie-sh.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
