[MediaWiki-commits] [Gerrit] Add apple-touch-icon.png to Wikidata, Wikinews and Wiktionary - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Add apple-touch-icon.png to Wikidata, Wikinews and Wiktionary
......................................................................


Add apple-touch-icon.png to Wikidata, Wikinews and Wiktionary

Refactoring

Change-Id: I20b202be2b755a8c1b73da736ee706e8425d441f
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 3 insertions(+), 23 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/mediawiki/files/apache/sites/main.conf 
b/modules/mediawiki/files/apache/sites/main.conf
index 76c323b..9134839 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -84,20 +84,13 @@
         RewriteRule     ^/w/wiki.phtml$      /w/index.php [L,QSA,NE]
     </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
     RewriteRule ^/w/$ /w/index.php
 
     Include "sites-enabled/wikidata-uris.incl"
-
     Include "sites-enabled/api-rewrites.incl"
-
-    # Configurable favicon
-    RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+    Include "sites-enabled/public-wiki-rewrites.incl"
 
     <Directory "/srv/mediawiki/docroot/wikidata/w">
        <IfModule mod_php5.c>
@@ -182,10 +175,6 @@
         RewriteRule     ^/w/wiki.phtml$      /w/index.php [L,QSA,NE]
     </IfDefine>
 
-
-    # Make robots.txt editable via Mediawiki:robots.txt
-    RewriteRule ^/robots.txt$ /w/robots.php [L]
-
     # ShortURL redirect RT-2121
     RewriteRule ^/s/.*$ /w/index.php
 
@@ -197,7 +186,6 @@
 
     # Primary wiki redirector:
     Alias /wiki /srv/mediawiki/docroot/wiktionary.org/w/index.php
-    RewriteRule ^/$ /w/index.php
     RewriteRule ^/w/$ /w/index.php
 
     # UseMod compatibility URLs
@@ -211,9 +199,7 @@
     RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.org/math/$1 
[R=301]
 
     Include "sites-enabled/api-rewrites.incl"
-
-    # Configurable favicon
-    RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+    Include "sites-enabled/public-wiki-rewrites.incl"
 
     <Directory "/srv/mediawiki/docroot/wiktionary.org/w">
        <IfModule mod_php5.c>
@@ -638,9 +624,6 @@
         RewriteRule     ^/w/wiki.phtml$      /w/index.php [L,QSA,NE]
     </IfDefine>
 
-    # Make robots.txt editable via Mediawiki:robots.txt
-    RewriteRule ^/robots.txt$ /w/robots.php [L]
-
     # ShortURL redirect RT-2121
     RewriteRule ^/s/.*$ /w/index.php
 
@@ -656,7 +639,6 @@
 
     # Primary wiki redirector:
     Alias /wiki /srv/mediawiki/docroot/wikinews.org/w/index.php
-    RewriteRule ^/$ /w/index.php
     RewriteRule ^/w/$ /w/index.php
 
     # UseMod compatibility URLs
@@ -670,9 +652,7 @@
     RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.org/math/$1 
[R=301]
 
     Include "sites-enabled/api-rewrites.incl"
-
-    # Configurable favicon
-    RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+    Include "sites-enabled/public-wiki-rewrites.incl"
 
     <Directory "/srv/mediawiki/docroot/wikinews.org/w">
         <IfModule mod_php5.c>

-- 
To view, visit https://gerrit.wikimedia.org/r/256440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I20b202be2b755a8c1b73da736ee706e8425d441f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits