[MediaWiki-commits] [Gerrit] beta: Move login and bits apache configs into wikimedia.conf... - change (operations/puppet)

2016-01-26 Thread Cmjohnson (Code Review) 
Cmjohnson has submitted this change and it was merged.

Change subject: beta: Move login and bits apache configs into wikimedia.conf, 
like prod
..


beta: Move login and bits apache configs into wikimedia.conf, like prod

Renames wmflabs to wikivoyage since that's all it contains now

Change-Id: I81a42b7a46034e7ddc8b1e54f3d703b860e75818
---
D modules/mediawiki/files/apache/beta/sites/loginwiki.conf
M modules/mediawiki/files/apache/beta/sites/wikimedia.conf
A modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
D modules/mediawiki/files/apache/beta/sites/wmflabs.conf
M modules/mediawiki/manifests/web/beta_sites.pp
5 files changed, 137 insertions(+), 141 deletions(-)

Approvals:
  Cmjohnson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf 
b/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
deleted file mode 100644
index 18e3572..000
--- a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# loginwiki
-
-DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
-ServerName login.wikimedia.beta.wmflabs.org
-
-AllowEncodedSlashes On
-
-RewriteEngine On
-
-
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
-ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php[P]
-RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php   [P]
-RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php  [P]
-
-
-#RewriteCond %{HTTP:X-Forwarded-Proto} !https
-#RewriteRule ^/(.*)$ https://login.wikimedia.beta.wmflabs.org/$1 [R=301,L]
-
-# Primary wiki redirector:
-Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
-RewriteRule ^/$ /w/index.php
-
-# Configurable favicon
-RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
-
-
-php_admin_flag engine on
-
-
-
-
-php_admin_flag engine off
-
-
-
diff --git a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf 
b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
index b460db6..faacfa5 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
@@ -1,4 +1,83 @@
 
+DocumentRoot "/srv/mediawiki/docroot/bits/"
+ServerName bits.beta.wmflabs.org
+
+# Version-independent aliases for backwards-compatibility
+Alias /w/extensions/ /srv/mediawiki/docroot/wikimedia.org/w/extensions/
+Alias /skins-1.5/ /srv/mediawiki/php/skins/
+Alias /skins/ /srv/mediawiki/php/skins/
+
+Alias /images/ /srv/mediawiki/images/
+
+# Handle error pages correctly if no mod_php is present
+
+ProxyPass  /w/404.php  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/404.php retry=0
+
+
+   
+   php_admin_flag engine on
+
+
+
+   
+   php_admin_flag engine off
+
+
+# Cache fonts in static-current/extensions for as long as possible.
+# Primarily here for UniversalLanguageSelector.
+
+
+
+Header set Cache-control "max-age=31536000"
+
+
+
+
+# Used for Firefox OS web application manifest living on bits.wikimedia.org
+AddType application/x-web-app-manifest+json .webapp
+
+
+# loginwiki
+
+DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
+ServerName login.wikimedia.beta.wmflabs.org
+
+AllowEncodedSlashes On
+
+RewriteEngine On
+
+
+ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
+ProxyPass   /w/extensions!
+ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
+RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php[P]
+RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php   [P]
+RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php  [P]
+
+
+#RewriteCond %{HTTP:X-Forwarded-Proto} !https
+#RewriteRule ^/(.*)$ https://login.wikimedia.beta.wmflabs.org/$1 [R=301,L]
+
+# Primary wiki redirector:
+Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
+RewriteRule ^/$ /w/index.php
+
+# Configurable favicon
+RewriteRule

[MediaWiki-commits] [Gerrit] beta: Move login and bits apache configs into wikimedia.conf... - change (operations/puppet)

2016-01-21 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review.

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

Change subject: beta: Move login and bits apache configs into wikimedia.conf, 
like prod
..

beta: Move login and bits apache configs into wikimedia.conf, like prod

Renames wmflabs to wikivoyage since that's all it contains now

Change-Id: I81a42b7a46034e7ddc8b1e54f3d703b860e75818
---
D modules/mediawiki/files/apache/beta/sites/loginwiki.conf
M modules/mediawiki/files/apache/beta/sites/wikimedia.conf
A modules/mediawiki/files/apache/beta/sites/wikivoyage.conf
D modules/mediawiki/files/apache/beta/sites/wmflabs.conf
M modules/mediawiki/manifests/web/beta_sites.pp
5 files changed, 137 insertions(+), 141 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/265659/1

diff --git a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf 
b/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
deleted file mode 100644
index 18e3572..000
--- a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# loginwiki
-
-DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
-ServerName login.wikimedia.beta.wmflabs.org
-
-AllowEncodedSlashes On
-
-RewriteEngine On
-
-
-ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
-ProxyPass   /w/extensions!
-ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
-RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php[P]
-RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php   [P]
-RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php  [P]
-
-
-#RewriteCond %{HTTP:X-Forwarded-Proto} !https
-#RewriteRule ^/(.*)$ https://login.wikimedia.beta.wmflabs.org/$1 [R=301,L]
-
-# Primary wiki redirector:
-Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
-RewriteRule ^/$ /w/index.php
-
-# Configurable favicon
-RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
-
-
-php_admin_flag engine on
-
-
-
-
-php_admin_flag engine off
-
-
-
diff --git a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf 
b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
index b460db6..faacfa5 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
@@ -1,4 +1,83 @@
 
+DocumentRoot "/srv/mediawiki/docroot/bits/"
+ServerName bits.beta.wmflabs.org
+
+# Version-independent aliases for backwards-compatibility
+Alias /w/extensions/ /srv/mediawiki/docroot/wikimedia.org/w/extensions/
+Alias /skins-1.5/ /srv/mediawiki/php/skins/
+Alias /skins/ /srv/mediawiki/php/skins/
+
+Alias /images/ /srv/mediawiki/images/
+
+# Handle error pages correctly if no mod_php is present
+
+ProxyPass  /w/404.php  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/404.php retry=0
+
+
+   
+   php_admin_flag engine on
+
+
+
+   
+   php_admin_flag engine off
+
+
+# Cache fonts in static-current/extensions for as long as possible.
+# Primarily here for UniversalLanguageSelector.
+
+
+
+Header set Cache-control "max-age=31536000"
+
+
+
+
+# Used for Firefox OS web application manifest living on bits.wikimedia.org
+AddType application/x-web-app-manifest+json .webapp
+
+
+# loginwiki
+
+DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
+ServerName login.wikimedia.beta.wmflabs.org
+
+AllowEncodedSlashes On
+
+RewriteEngine On
+
+
+ProxyPass   /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
+ProxyPass   /w/extensions!
+ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
+RewriteRule ^/$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php[P]
+RewriteRule ^/robots\.txt$   
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php   [P]
+RewriteRule ^/favicon\.ico$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php  [P]
+
+
+#RewriteCond %{HTTP:X-Forwarded-Proto} !https
+#RewriteRule ^/(.*)$ https://login.wikimedia.beta.wmflabs.org/$1 [R=301,L]
+
+# Primary wiki redirector:
+Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
+RewriteRule ^/$ /w/index.php
+
+#