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..0000000 --- a/modules/mediawiki/files/apache/beta/sites/loginwiki.conf +++ /dev/null @@ -1,39 +0,0 @@ -# loginwiki -<VirtualHost *:80> - DocumentRoot "/srv/mediawiki/docroot/wikimedia.org" - ServerName login.wikimedia.beta.wmflabs.org - - AllowEncodedSlashes On - - RewriteEngine On - - <IfDefine HHVM> - 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] - </IfDefine> - - #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] - - <Directory "/srv/mediawiki/docroot/wikimedia.org/w"> - <IfModule mod_php5.c> - php_admin_flag engine on - </IfModule> - </Directory> - <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions"> - <IfModule mod_php5.c> - php_admin_flag engine off - </IfModule> - </Directory> -</VirtualHost> 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 @@ <VirtualHost *:80> + 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 + <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> + +# loginwiki +<VirtualHost *:80> + DocumentRoot "/srv/mediawiki/docroot/wikimedia.org" + ServerName login.wikimedia.beta.wmflabs.org + + AllowEncodedSlashes On + + RewriteEngine On + + <IfDefine HHVM> + 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] + </IfDefine> + + #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] + + <Directory "/srv/mediawiki/docroot/wikimedia.org/w"> + <IfModule mod_php5.c> + php_admin_flag engine on + </IfModule> + </Directory> + <Directory "/srv/mediawiki/docroot/wikimedia.org/w/extensions"> + <IfModule mod_php5.c> + php_admin_flag engine off + </IfModule> + </Directory> +</VirtualHost> + +<VirtualHost *:80> DocumentRoot "/srv/mediawiki/docroot/wikimedia.org" ServerName zero.wikimedia.beta.wmflabs.org diff --git a/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf b/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf new file mode 100644 index 0000000..cef5c1f --- /dev/null +++ b/modules/mediawiki/files/apache/beta/sites/wikivoyage.conf @@ -0,0 +1,56 @@ +# Wikivoyage + +<VirtualHost *:80> + ServerName wikivoyage + ServerAlias *.wikivoyage.beta.wmflabs.org + UseCanonicalName off + DocumentRoot "/srv/mediawiki/docroot/wikivoyage.org" + + AllowEncodedSlashes On + + RewriteEngine On + + <IfDefine HHVM> + ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php retry=0 + ProxyPass /w/extensions ! + ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/$1 + RewriteRule ^/$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php [P] + RewriteRule ^/robots\.txt$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/robots.php [P] + RewriteRule ^/favicon\.ico$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/favicon.php [P] + </IfDefine> + + # Make robots.txt editable via Mediawiki:robots.txt + RewriteRule ^/robots.txt$ /w/robots.php [L] + + # Send www.de.wikivoyage.org -> de.wikivoyage.org + RewriteCond %{HTTP_HOST} www.([a-z-]+).wikivoyage.(com|net|org) + RewriteRule ^(.*)$ http://%1.wikivoyage.org$1 [R=301,L] + + # Primary wiki redirector: + Alias /wiki /srv/mediawiki/docroot/wikivoyage.org/w/index.php + RewriteRule ^/$ /w/index.php + + # UseMod compatibility URLs + RewriteCond %{QUERY_STRING} ([^&;]+) + RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L] + RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L] + + # Early phase 2 compatibility URLs + RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L] + + <Directory "/srv/mediawiki/docroot/wikivoyage.org/w"> + <IfModule mod_php5.c> + php_admin_flag engine on + </IfModule> + </Directory> + <Directory "/srv/mediawiki/docroot/wikivoyage.org/w/extensions"> + <IfModule mod_php5.c> + php_admin_flag engine off + </IfModule> + </Directory> + +</VirtualHost> + + + +# vim: sts=4 sw=4 syn=apache autoindent diff --git a/modules/mediawiki/files/apache/beta/sites/wmflabs.conf b/modules/mediawiki/files/apache/beta/sites/wmflabs.conf deleted file mode 100644 index bce0286..0000000 --- a/modules/mediawiki/files/apache/beta/sites/wmflabs.conf +++ /dev/null @@ -1,95 +0,0 @@ -<VirtualHost *:80> - 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 - <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> - -# Wikivoyage - -<VirtualHost *:80> - ServerName wikivoyage - ServerAlias *.wikivoyage.beta.wmflabs.org - UseCanonicalName off - DocumentRoot "/srv/mediawiki/docroot/wikivoyage.org" - - AllowEncodedSlashes On - - RewriteEngine On - - <IfDefine HHVM> - ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php retry=0 - ProxyPass /w/extensions ! - ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/$1 - RewriteRule ^/$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/index.php [P] - RewriteRule ^/robots\.txt$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/robots.php [P] - RewriteRule ^/favicon\.ico$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikivoyage.org/w/favicon.php [P] - </IfDefine> - - # Make robots.txt editable via Mediawiki:robots.txt - RewriteRule ^/robots.txt$ /w/robots.php [L] - - # Send www.de.wikivoyage.org -> de.wikivoyage.org - RewriteCond %{HTTP_HOST} www.([a-z-]+).wikivoyage.(com|net|org) - RewriteRule ^(.*)$ http://%1.wikivoyage.org$1 [R=301,L] - - # Primary wiki redirector: - Alias /wiki /srv/mediawiki/docroot/wikivoyage.org/w/index.php - RewriteRule ^/$ /w/index.php - - # UseMod compatibility URLs - RewriteCond %{QUERY_STRING} ([^&;]+) - RewriteRule ^/wiki\.cgi$ /w/index.php?title=%1 [R=301,L] - RewriteRule ^/wiki\.cgi$ /w/index.php [R=301,L] - - # Early phase 2 compatibility URLs - RewriteRule ^/wiki\.phtml$ /w/index.php [R=301,L] - - <Directory "/srv/mediawiki/docroot/wikivoyage.org/w"> - <IfModule mod_php5.c> - php_admin_flag engine on - </IfModule> - </Directory> - <Directory "/srv/mediawiki/docroot/wikivoyage.org/w/extensions"> - <IfModule mod_php5.c> - php_admin_flag engine off - </IfModule> - </Directory> - -</VirtualHost> - - - -# vim: sts=4 sw=4 syn=apache autoindent diff --git a/modules/mediawiki/manifests/web/beta_sites.pp b/modules/mediawiki/manifests/web/beta_sites.pp index a935315..7f32395 100644 --- a/modules/mediawiki/manifests/web/beta_sites.pp +++ b/modules/mediawiki/manifests/web/beta_sites.pp @@ -57,18 +57,13 @@ priority => 11, } - apache::site { 'loginwiki': - source => 'puppet:///modules/mediawiki/apache/beta/sites/loginwiki.conf', - priority => 12, - } - apache::site { 'upload': source => 'puppet:///modules/mediawiki/apache/beta/sites/upload.conf', priority => 13, } - apache::site { 'wmflabs': - source => 'puppet:///modules/mediawiki/apache/beta/sites/wmflabs.conf', + apache::site { 'wikivoyage': + source => 'puppet:///modules/mediawiki/apache/beta/sites/wikivoyage.conf', priority => 15, } -- To view, visit https://gerrit.wikimedia.org/r/265659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81a42b7a46034e7ddc8b1e54f3d703b860e75818 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk <kren...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits