[MediaWiki-commits] [Gerrit] mediawiki: Apply public-wiki-rewrites.incl to www.mediawiki.org - change (operations/puppet)

2016-02-17 Thread Ori.livneh (Code Review) 
Ori.livneh has submitted this change and it was merged.

Change subject: mediawiki: Apply public-wiki-rewrites.incl to www.mediawiki.org
..


mediawiki: Apply public-wiki-rewrites.incl to www.mediawiki.org

Follows-up 73cd57b (added wmfstatic), 0c901c8 (created the include).

Otherwise wmfstatic paths don't work. E.g.
> https://www.mediawiki.org/w/resources/assets/poweredby_mediawiki_88x31.png

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

Approvals:
  Ori.livneh: 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 90624a1..c23dde5 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -17,9 +17,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]
-
 RewriteRule ^/upload/(.*)$ 
%{ENV:RW_PROTO}://upload.wikimedia.org/mediawiki/$1 [R=302]
 
 # Our FAQ
@@ -36,8 +33,10 @@
 
 # Primary wiki redirector:
 Alias /wiki /srv/mediawiki/docroot/mediawiki/w/index.php
-RewriteRule ^/$ /w/index.php
 RewriteRule ^/w/$ /w/index.php
+
+Include "sites-enabled/api-rewrites.incl"
+Include "sites-enabled/public-wiki-rewrites.incl"
 
 # UseMod compatibility URLs
 RewriteCond %{QUERY_STRING} ([^&;]+)
@@ -48,11 +47,6 @@
 RewriteRule ^/wiki\.phtml$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php 
[R=301,L]
 
 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]
 
 


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13551006f44a4a9afb8ae61da8e728e103f7
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki: Apply public-wiki-rewrites.incl to www.mediawiki.org - change (operations/puppet)

2016-02-16 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/271013

Change subject: mediawiki: Apply public-wiki-rewrites.incl to www.mediawiki.org
..

mediawiki: Apply public-wiki-rewrites.incl to www.mediawiki.org

Follows-up 73cd57b (added wmfstatic), 0c901c8 (created the include).

Otherwise wmfstatic paths don't work. E.g.
> https://www.mediawiki.org/w/resources/src/startup.js

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/271013/1

diff --git a/modules/mediawiki/files/apache/sites/main.conf 
b/modules/mediawiki/files/apache/sites/main.conf
index 90624a1..c23dde5 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -17,9 +17,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]
-
 RewriteRule ^/upload/(.*)$ 
%{ENV:RW_PROTO}://upload.wikimedia.org/mediawiki/$1 [R=302]
 
 # Our FAQ
@@ -36,8 +33,10 @@
 
 # Primary wiki redirector:
 Alias /wiki /srv/mediawiki/docroot/mediawiki/w/index.php
-RewriteRule ^/$ /w/index.php
 RewriteRule ^/w/$ /w/index.php
+
+Include "sites-enabled/api-rewrites.incl"
+Include "sites-enabled/public-wiki-rewrites.incl"
 
 # UseMod compatibility URLs
 RewriteCond %{QUERY_STRING} ([^&;]+)
@@ -48,11 +47,6 @@
 RewriteRule ^/wiki\.phtml$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php 
[R=301,L]
 
 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]
 
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13551006f44a4a9afb8ae61da8e728e103f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle 

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