Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385112 )
Change subject: Swap wikimediafoundation.org over to using standard-docroot
......................................................................
Swap wikimediafoundation.org over to using standard-docroot
Change-Id: Ibeee48001372f9d30597b59f77b5169b0656e0f9
---
M modules/mediawiki/files/apache/sites/foundation.conf
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/foundation.conf
b/modules/mediawiki/files/apache/sites/foundation.conf
index cdafadf..c6aa928 100644
--- a/modules/mediawiki/files/apache/sites/foundation.conf
+++ b/modules/mediawiki/files/apache/sites/foundation.conf
@@ -1,5 +1,5 @@
<VirtualHost *:80>
- DocumentRoot "/srv/mediawiki/docroot/foundation"
+ DocumentRoot "/srv/mediawiki/docroot/wikimediafoundation.org"
ServerName wikimediafoundation.org
AllowEncodedSlashes On
@@ -19,7 +19,7 @@
RewriteRule ^/bylaws\.pdf
%{ENV:RW_PROTO}://%{SERVER_NAME}/wiki/Wikimedia_Foundation_bylaws [R,L]
# Primary wiki redirector:
- Alias /wiki /srv/mediawiki/docroot/foundation/w/index.php
+ Alias /wiki /srv/mediawiki/docroot/wikimediafoundation.org/w/index.php
Include "sites-enabled/public-wiki-rewrites.incl"
Include "sites-enabled/api-rewrites.incl"
Include "sites-enabled/wikimedia-legacy.incl"
@@ -28,12 +28,12 @@
RewriteRule ^/wiki/Donate$ https://donate.wikimedia.org/ [R=301,L]
- <Directory "/srv/mediawiki/docroot/foundation/w">
+ <Directory "/srv/mediawiki/docroot/wikimediafoundation.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/srv/mediawiki/docroot/foundation/w/extensions">
+ <Directory "/srv/mediawiki/docroot/wikimediafoundation.org/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
--
To view, visit https://gerrit.wikimedia.org/r/385112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeee48001372f9d30597b59f77b5169b0656e0f9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
