[MediaWiki-commits] [Gerrit] Fix apple-touch-icon.png on wikipedias - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Fix apple-touch-icon.png on wikipedias
..
Fix apple-touch-icon.png on wikipedias
Bug: T115965
Change-Id: I8ae8046341e5cb18ddf2b3715cdadf1fd40b7bcb
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 1 insertion(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
Objections:
Alex Monk: There's a problem with this change, please improve
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index 3c0f19b..76c323b 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -386,9 +386,6 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
-# Make robots.txt editable via Mediawiki:robots.txt
-RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
@@ -401,7 +398,6 @@
# Standard intrawiki rewrites
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikipedia.org/w/index.php
-RewriteRule ^/$ /w/index.php
RewriteRule ^/w/$ /w/index.php
# UseMod compatibility URLs
@@ -423,9 +419,7 @@
RewriteRule ^/wikistats(/(.*$)|$) %{ENV:RW_PROTO}://stats.wikimedia.org/$2
[R=302,L]
Include "sites-enabled/api-rewrites.incl"
-
-# Configurable favicon
-RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+Include "sites-enabled/public-wiki-rewrites.incl"
--
To view, visit https://gerrit.wikimedia.org/r/256437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ae8046341e5cb18ddf2b3715cdadf1fd40b7bcb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix apple-touch-icon.png on wikipedias - change (operations/puppet)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/256437
Change subject: Fix apple-touch-icon.png on wikipedias
..
Fix apple-touch-icon.png on wikipedias
Bug: T115965
Change-Id: I8ae8046341e5cb18ddf2b3715cdadf1fd40b7bcb
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/256437/1
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index 3c0f19b..76c323b 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -386,9 +386,6 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
-# Make robots.txt editable via Mediawiki:robots.txt
-RewriteRule ^/robots.txt$ /w/robots.php [L]
-
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
@@ -401,7 +398,6 @@
# Standard intrawiki rewrites
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikipedia.org/w/index.php
-RewriteRule ^/$ /w/index.php
RewriteRule ^/w/$ /w/index.php
# UseMod compatibility URLs
@@ -423,9 +419,7 @@
RewriteRule ^/wikistats(/(.*$)|$) %{ENV:RW_PROTO}://stats.wikimedia.org/$2
[R=302,L]
Include "sites-enabled/api-rewrites.incl"
-
-# Configurable favicon
-RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+Include "sites-enabled/public-wiki-rewrites.incl"
--
To view, visit https://gerrit.wikimedia.org/r/256437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ae8046341e5cb18ddf2b3715cdadf1fd40b7bcb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
