Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333958 )
Change subject: beta: standardize deployment.wikimedia.beta.wmflabs.org docroot
......................................................................
beta: standardize deployment.wikimedia.beta.wmflabs.org docroot
Use wikimedia.org as it's a wikimedia.org docroot (and there's nothing
special about it)
Change-Id: Ib8a38fe292fac903a5d90125149aa697ed478471
---
M modules/mediawiki/files/apache/beta/sites/beta_specific.conf
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Chad: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/beta/sites/beta_specific.conf
b/modules/mediawiki/files/apache/beta/sites/beta_specific.conf
index 03f6c17..9d178f6 100644
--- a/modules/mediawiki/files/apache/beta/sites/beta_specific.conf
+++ b/modules/mediawiki/files/apache/beta/sites/beta_specific.conf
@@ -13,20 +13,20 @@
</VirtualHost>
<VirtualHost *:80>
ServerName deployment.wikimedia.beta.wmflabs.org
- DocumentRoot "/srv/mediawiki/docroot/labs"
+ DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
AllowEncodedSlashes On
RewriteEngine On
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/index.php retry=0
+ 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/labs/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/favicon.php [P]
+ 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/labs/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
</VirtualHost>
<VirtualHost *:80>
--
To view, visit https://gerrit.wikimedia.org/r/333958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8a38fe292fac903a5d90125149aa697ed478471
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
