Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/50346
Change subject: Use favicon.php for /favicon.ico of all wikis
......................................................................
Use favicon.php for /favicon.ico of all wikis
This allows legacy clients to see the same favicon as the one sent by
MediaWiki due to $wgFavicon. Also, using a script for configurable
favicons removes one of the very few remaining reasons for keeping the
document roots for second-level subdomains separate.
Also, removed some obsolete yaseo references, and removed obsolete
mod_mmap_static configuration. Both favicon.ico and robots.txt are
scripts now.
Change-Id: I35d3af43b9bbf0fd4bcdf42e35c31c74a76445aa
---
M foundation.conf
M main.conf
M remnant.conf
M wikimedia.conf
4 files changed, 181 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config
refs/changes/46/50346/1
diff --git a/foundation.conf b/foundation.conf
index baa5726..ca63e92 100644
--- a/foundation.conf
+++ b/foundation.conf
@@ -39,6 +39,9 @@
RewriteRule ^/wiki/Donate$ https://donate.wikimedia.org/ [R=301,L]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/foundation/w">
<IfModule mod_php5.c>
php_admin_flag engine on
diff --git a/main.conf b/main.conf
index d6bbdf0..d037a78 100644
--- a/main.conf
+++ b/main.conf
@@ -38,6 +38,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/mediawiki/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -68,6 +71,9 @@
Alias /wiki /usr/local/apache/common/docroot/wikidata/w/index.php
RewriteRule ^/$ /w/index.php
RewriteRule ^/w/$ /w/index.php
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikidata/w">
<IfModule mod_php5.c>
@@ -102,9 +108,6 @@
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
- # Test for making favicon.ico a script
- RewriteRule ^/test-favicon\.ico$ /w/favicon.php [L]
-
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
RewriteCond %{HTTP_HOST} ([a-z]+)\.wiktionary\.org
@@ -125,6 +128,9 @@
RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wiktionary.org/w">
<IfModule mod_php5.c>
@@ -197,6 +203,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/wikiquote.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -245,6 +254,9 @@
RewriteCond %{QUERY_STRING} ([^&;]+)
RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L]
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/donate/w">
<IfModule mod_php5.c>
@@ -324,6 +336,9 @@
# moved wikistats off NFS
RewriteRule ^/wikistats(/(.*$)|$) http://stats.wikimedia.org/$2 [R=302,L]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/wikipedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -399,6 +414,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/wikibooks.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -468,6 +486,9 @@
RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikisource.org/w">
<IfModule mod_php5.c>
@@ -539,6 +560,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/wikinews.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -606,6 +630,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/wikiversity.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -659,6 +686,9 @@
Alias /wiki /usr/local/apache/common/docroot/wikivoyage.org/w/index.php
RewriteRule ^/$ /w/index.php
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/wikivoyage.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -671,21 +701,6 @@
</Directory>
</VirtualHost>
-
-
-# Wikipedias are now handled with a shared document root, above
-
-<IfModule mod_mmap_static.c>
- MMapFile /usr/local/apache/common/favicon.ico
- MMapFile /usr/local/apache/common/robots.txt
-# MMapFile /usr/local/apache/common/upload/wiki.png
-# MMapFile /usr/local/apache/common/style/cologneblue.css
-# MMapFile /usr/local/apache/common/style/nostalgia.css
-# MMapFile /usr/local/apache/common/style/quickbar.css
-# MMapFile /usr/local/apache/common/style/sticky.js
-# MMapFile /usr/local/apache/common/style/wikiprintable.css
-# MMapFile /usr/local/apache/common/style/wikistandard.css
-</IfModule>
LoadModule deflate_module /usr/lib/apache2/modules/mod_deflate.so
<IfModule mod_deflate.c>
diff --git a/remnant.conf b/remnant.conf
index a79a743..93a2d68 100644
--- a/remnant.conf
+++ b/remnant.conf
@@ -26,9 +26,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikipedia/meta/$1
[R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/meta/w">
<IfModule mod_php5.c>
@@ -62,9 +64,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/sources/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/sources/w">
<IfModule mod_php5.c>
@@ -101,9 +105,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/commons/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/commons/w">
<IfModule mod_php5.c>
@@ -139,6 +145,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/grants/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -172,6 +181,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/fdc/w">
<IfModule mod_php5.c>
@@ -208,9 +220,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikimania2005/w">
<IfModule mod_php5.c>
@@ -253,9 +267,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2006/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikimania2006/w">
<IfModule mod_php5.c>
@@ -292,9 +308,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2007/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikimania2007/w">
<IfModule mod_php5.c>
@@ -331,9 +349,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2008/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikimania2008/w">
<IfModule mod_php5.c>
@@ -370,9 +390,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2009/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikimania2009/w">
<IfModule mod_php5.c>
@@ -409,9 +431,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2010/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikimania2010/w">
<IfModule mod_php5.c>
@@ -448,9 +472,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2011/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikimania2011/w">
<IfModule mod_php5.c>
@@ -487,9 +513,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2012/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikimania2012/w">
<IfModule mod_php5.c>
@@ -527,9 +555,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/wikimania2013/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/wikimania2013/w">
<IfModule mod_php5.c>
@@ -566,6 +596,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/internal/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -599,6 +632,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/board/w">
<IfModule mod_php5.c>
@@ -634,6 +670,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/boardgovcom/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -667,6 +706,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/spcom/w">
<IfModule mod_php5.c>
@@ -702,6 +744,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/chapcom/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -736,6 +781,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/wikimaniateam/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -767,6 +815,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/incubator/w">
<IfModule mod_php5.c>
@@ -800,9 +851,11 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
- # Uploads are offsite (except on yaseo)
- RewriteCond %{SERVER_ADDR} !^211\.115\.107
+ # Uploads are offsite
RewriteRule ^/upload/(.*)$
http://upload.wikimedia.org/wikipedia/species/$1 [R=302]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/species/w">
<IfModule mod_php5.c>
@@ -838,6 +891,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/searchcom/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -869,6 +925,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/usability/w">
<IfModule mod_php5.c>
@@ -903,6 +962,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/arbcom_dewiki/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -934,6 +996,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/arbcom_nlwiki/w">
<IfModule mod_php5.c>
@@ -968,6 +1033,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/strategy/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -1001,6 +1069,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/office/w">
<IfModule mod_php5.c>
@@ -1037,6 +1108,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/nomcom/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -1071,6 +1145,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/chair/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -1102,6 +1179,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/advisory/w">
<IfModule mod_php5.c>
@@ -1137,6 +1217,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/auditcom/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -1169,6 +1252,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/quality/w">
<IfModule mod_php5.c>
@@ -1205,6 +1291,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/otrs-wiki/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -1238,6 +1327,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/exec/w">
<IfModule mod_php5.c>
@@ -1273,6 +1365,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/collab/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -1305,6 +1400,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/outreach/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -1336,6 +1434,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/arbcom_fiwiki/w">
<IfModule mod_php5.c>
@@ -1371,6 +1472,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/movementroles/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -1402,6 +1506,9 @@
RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L]
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
<Directory "/usr/local/apache/common/docroot/tenwiki/w">
<IfModule mod_php5.c>
@@ -1437,6 +1544,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/checkuser/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -1471,6 +1581,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/steward/w">
<IfModule mod_php5.c>
php_admin_flag engine on
diff --git a/wikimedia.conf b/wikimedia.conf
index 8eb10c5..02aeb46 100644
--- a/wikimedia.conf
+++ b/wikimedia.conf
@@ -59,6 +59,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
@@ -107,6 +110,9 @@
RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+ # Configurable favicon
+ RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
<Directory "/usr/local/apache/common/docroot/wikimedia.org/w">
<IfModule mod_php5.c>
php_admin_flag engine on
--
To view, visit https://gerrit.wikimedia.org/r/50346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35d3af43b9bbf0fd4bcdf42e35c31c74a76445aa
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
