Ori.livneh has submitted this change and it was merged.
Change subject: beta: Use public-wiki-rewrites.incl to better match mediawiki
production
......................................................................
beta: Use public-wiki-rewrites.incl to better match mediawiki production
This include is already provided via sites.pp by the mediawiki role to both
beta_sites and prod_sites.
Change-Id: I934cd383e40f5e0609a1afef847043b386480562
---
M modules/mediawiki/files/apache/beta/sites/remnant.conf
M modules/mediawiki/files/apache/beta/sites/testwiki.conf
M modules/mediawiki/files/apache/beta/sites/wikibooks.conf
M modules/mediawiki/files/apache/beta/sites/wikidata.conf
M modules/mediawiki/files/apache/beta/sites/wikimedia.conf
M modules/mediawiki/files/apache/beta/sites/wikinews.conf
M modules/mediawiki/files/apache/beta/sites/wikipedia.conf
M modules/mediawiki/files/apache/beta/sites/wikiquote.conf
M modules/mediawiki/files/apache/beta/sites/wikisource.conf
M modules/mediawiki/files/apache/beta/sites/wikiversity.conf
M modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
M modules/mediawiki/files/apache/beta/sites/wiktionary.conf
12 files changed, 14 insertions(+), 50 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/beta/sites/remnant.conf
b/modules/mediawiki/files/apache/beta/sites/remnant.conf
index 323ffc8..56f1a99 100644
--- a/modules/mediawiki/files/apache/beta/sites/remnant.conf
+++ b/modules/mediawiki/files/apache/beta/sites/remnant.conf
@@ -15,12 +15,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/commons/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/commons/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/commons/w">
<IfModule mod_php5.c>
@@ -51,12 +48,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
@@ -87,12 +81,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/labs/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/labs/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/labs/w">
<IfModule mod_php5.c>
diff --git a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
index a606ee9..4b76865 100644
--- a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
+++ b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
@@ -18,7 +18,7 @@
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
b/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
index 4ff535d..68277cf 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikibooks.conf
@@ -18,12 +18,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikibooks.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wikibooks.org/w">
<IfModule mod_php5.c>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikidata.conf
b/modules/mediawiki/files/apache/beta/sites/wikidata.conf
index 1a89a5f..226fd6e 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikidata.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikidata.conf
@@ -16,12 +16,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
RewriteRule ^/w/$ /w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
index b0b00b5..d2c0ab4 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
@@ -16,7 +16,7 @@
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikinews.conf
b/modules/mediawiki/files/apache/beta/sites/wikinews.conf
index 134c86b..c588ab4 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikinews.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikinews.conf
@@ -18,12 +18,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikinews.org/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikinews.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wikinews.org/w">
<IfModule mod_php5.c>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikipedia.conf
b/modules/mediawiki/files/apache/beta/sites/wikipedia.conf
index b1957c3..826db32 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikipedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikipedia.conf
@@ -18,12 +18,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikipedia.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
# Redirect commons.wikipedia to commons.wikimedia
RewriteCond %{HTTP_HOST} =commons.wikipedia.beta.wmflabs.org
diff --git a/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
b/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
index e7e8fa9..0b65515 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
@@ -18,12 +18,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikiquote.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wikiquote.org/w">
<IfModule mod_php5.c>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikisource.conf
b/modules/mediawiki/files/apache/beta/sites/wikisource.conf
index 224e42f..80de9e8 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikisource.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikisource.conf
@@ -18,12 +18,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikisource.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wikisource.org/w">
<IfModule mod_php5.c>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
b/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
index 74accd7..f429f2d 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikiversity.conf
@@ -18,12 +18,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiversity.org/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikiversity.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wikiversity.org/w">
<IfModule mod_php5.c>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
b/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
index d339b6d..1b99c02 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
@@ -16,12 +16,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wikivoyage.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wikivoyage.org/w">
<IfModule mod_php5.c>
diff --git a/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
b/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
index b0239ef..137d50f 100644
--- a/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
@@ -18,12 +18,9 @@
RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/favicon.php [P]
</IfDefine>
- # Make robots.txt editable via Mediawiki:robots.txt
- RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# Primary wiki redirector
Alias /wiki /srv/mediawiki/docroot/wiktionary.org/w/index.php
- RewriteRule ^/$ /w/index.php
+ Include "sites-enabled/public-wiki-rewrites.incl"
<Directory "/srv/mediawiki/docroot/wiktionary.org/w">
<IfModule mod_php5.c>
--
To view, visit https://gerrit.wikimedia.org/r/270009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I934cd383e40f5e0609a1afef847043b386480562
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Krinkle <[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
