Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: beta: copy prod bits apache config
......................................................................
beta: copy prod bits apache config
Update apache config for bits.beta.wmflabs.org to match bits.mw.o
Change-Id: I8c7d4b25272e88b755f36406f03f2f3496c8f482
---
M modules/mediawiki/files/apache/beta/sites/wmflabs.conf
1 file changed, 27 insertions(+), 7 deletions(-)
Approvals:
Chad: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/beta/sites/wmflabs.conf
b/modules/mediawiki/files/apache/beta/sites/wmflabs.conf
index 9dfd8e6..84603d5 100644
--- a/modules/mediawiki/files/apache/beta/sites/wmflabs.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wmflabs.conf
@@ -142,13 +142,33 @@
Alias /skins/ /srv/mediawiki/php/skins/
Alias /images/ /srv/mediawiki/images/
- Alias /centralnotice/ /mnt/upload6/centralnotice/
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
- # Aliases for 1.17 wikis
- Alias /w/extensions-1.17/ /srv/mediawiki/live-1.5/extensions-1.17/
- Alias /skins-1.17/ /srv/mediawiki/live-1.5/skins-1.17/
+
+ # Handle error pages correctly if no mod_php is present
+ <IfDefine HHVM>
+ ProxyPass /w/404.php
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/404.php retry=0
+ </IfDefine>
+ <Directory "/srv/mediawiki/docroot/bits/w">
+ <IfModule mod_php5.c>
+ php_admin_flag engine on
+ </IfModule>
+ </Directory>
+ <Directory "/srv/mediawiki/docroot/bits/w/extensions">
+ <IfModule mod_php5.c>
+ php_admin_flag engine off
+ </IfModule>
+ </Directory>
+ # Cache fonts in static-current/extensions for as long as possible.
+ # Primarily here for UniversalLanguageSelector.
+ <Directory "/srv/mediawiki/docroot/bits/static/current/extensions">
+ <IfModule mod_headers.c>
+ <FilesMatch "\.(eot|ttf|woff|woff2)$">
+ Header set Cache-control "max-age=31536000"
+ </FilesMatch>
+ </IfModule>
+ </Directory>
+
+ # Used for Firefox OS web application manifest living on bits.wikimedia.org
+ AddType application/x-web-app-manifest+json .webapp
</VirtualHost>
# job.w.o
--
To view, visit https://gerrit.wikimedia.org/r/231583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c7d4b25272e88b755f36406f03f2f3496c8f482
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
