[mb-commits] branch, pino-beta, updated. MBH-298, Force correct server hostname/port on rewrites.
MusicBrainz Git Server <[email protected]> Fri, 18 Jan 2013 09:38:08 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1Tw8Om-0007xL-Ql@wiley> |
The branch, pino-beta has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c8b8ceafca36c285d975e8054c20c87efcbd09f7 (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=952d18aa001ea794a25d4e509c74230178ac3282 (commit)
Summary of changes:
admin/nginx/mbserver-rewrites.conf | 295 ++++++++++++++++++------------------
1 files changed, 150 insertions(+), 145 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c8b8ceafca36c285d975e8054c20c87efcbd09f7
Author: beta <beta@pino.(none)>
Date: Fri Jan 18 09:32:36 2013 +0000
MBH-298, Force correct server hostname/port on rewrites.
diff --git a/admin/nginx/mbserver-rewrites.conf b/admin/nginx/mbserver-rewrites.conf
index 520d831..03966b8 100644
--- a/admin/nginx/mbserver-rewrites.conf
+++ b/admin/nginx/mbserver-rewrites.conf
@@ -17,6 +17,11 @@ if ($not_canonical = HGWS) {
rewrite ^/(.*)$ $scheme://musicbrainz.org/$1 permanent;
}
+set $mb_server "";
+if ($http_host = beta.musicbrainz.org) {
+ set $mb_server "$scheme://beta.musicbrainz.org";
+}
+
# Pages on other host thingies
rewrite ^/(~.*)$ http://users.musicbrainz.org/$1 permanent;
rewrite ^/finances\.html$ http://metabrainz.org/finances permanent;
@@ -34,85 +39,85 @@ rewrite ^/(RFE|rfe)$ http://jira.musicbrainz.org/secure/Crea
# Wikidocs pages
-rewrite ^/popup/(.*)$ /doc/TextFragments/Popup/$1 ;
-rewrite ^/wd/(.*)$ /doc/$1 ;
-
-rewrite ^/about/helpwanted\.html$ /doc/Help_Wanted permanent;
-rewrite ^/about/logos\.html$ /doc/MusicBrainz_Logos permanent;
-rewrite ^/about/licenses\.html$ /doc/MusicBrainz_License permanent;
-rewrite ^/about/mirrors\.html$ /doc/Mirror_Server permanent;
-rewrite ^/about/stats\.html$ /doc/Server_Statistics permanent;
-rewrite ^/bio\.html$ /doc/People permanent;
-rewrite ^/cd_submission\.html$ /doc/Disc_Submission permanent;
-rewrite ^/client_howto\.html$ /doc/Client_HOWTO permanent;
-rewrite ^/contract\.html$ /doc/Social_Contract permanent;
-rewrite ^/contribute\.html$ /doc/Contribute permanent;
-rewrite ^/db_structure\.html$ /doc/Database_Schema permanent;
-rewrite ^/development/mmd$ /doc/XML_Web_Service permanent;
-rewrite ^/development/mmd/(.*)$ /doc/XML_Web_Service permanent;
-rewrite ^/disc\.html$ /doc/Disc_ID_Calculation permanent;
-rewrite ^/documentation\.html$ /doc/MusicBrainz_Documentation permanent;
-rewrite ^/download\.html$ /doc/Products permanent;
-rewrite ^/faq\.html$ /doc/Frequently_Asked_Questions permanent;
-rewrite ^/fmc$ /doc/FutureOfMusicWelcomePage ;
-rewrite ^/history\.html$ /doc/MusicBrainz_History permanent;
-rewrite ^/how\.html$ /doc/How_MusicBrainz_Works permanent;
-rewrite ^/introduction\.html$ /doc/About_MusicBrainz permanent;
-rewrite ^/license\.html$ /doc/Database_License_White_Paper permanent;
-rewrite ^/list\.html$ /doc/Mailing_List permanent;
-rewrite ^/mm/mm-2\.1$ /doc/Client_HOWTO last;
-rewrite ^/mm/mq-1\.1$ /doc/Client_HOWTO last;
-rewrite ^/mod_faq\.html$ /doc/Editing_FAQ permanent;
-rewrite ^/mod_intro\.html$ /doc/How_Editing_Works permanent;
-rewrite ^/news/licenses\.html$ /doc/MusicBrainz_License permanent;
-rewrite ^/press\.html$ /doc/MusicBrainz_Press permanent;
-rewrite ^/privacy$ /doc/MusicBrainz_Privacy_Policy permanent;
-rewrite ^/products/libdiscid$ /doc/libdiscid permanent;
-rewrite ^/products/libmusicbrainz$ /doc/libmusicbrainz permanent;
-rewrite ^/products/picard/index\.html$ /doc/Picard_Documentation permanent;
-rewrite ^/products/picard/tutorial/index\.html$ /doc/Picard_Tutorial permanent;
-rewrite ^/products/python-musicbrainz2 /doc/python-musicbrainz2 permanent;
-rewrite ^/products/server/docs/20031226-1\.html$ /doc/Advanced_Search permanent;
-rewrite ^/products/tunepimp/index\.html$ /doc/libtunepimp permanent;
-rewrite ^/products/tunepimp$ /doc/libtunepimp permanent;
-rewrite ^/products/tunepimp/download\.html$ /doc/libtunepimp_Download permanent;
-rewrite ^/support/contact\.html$ /doc/Contact_Us permanent;
-rewrite ^/style\.html$ /doc/Style_Guidelines permanent;
-rewrite ^/tagger/ /doc/Classic_Tagger permanent; # redirect all tagger pages
+rewrite ^/popup/(.*)$ $mb_server/doc/TextFragments/Popup/$1 ;
+rewrite ^/wd/(.*)$ $mb_server/doc/$1 ;
+
+rewrite ^/about/helpwanted\.html$ $mb_server/doc/Help_Wanted permanent;
+rewrite ^/about/logos\.html$ $mb_server/doc/MusicBrainz_Logos permanent;
+rewrite ^/about/licenses\.html$ $mb_server/doc/MusicBrainz_License permanent;
+rewrite ^/about/mirrors\.html$ $mb_server/doc/Mirror_Server permanent;
+rewrite ^/about/stats\.html$ $mb_server/doc/Server_Statistics permanent;
+rewrite ^/bio\.html$ $mb_server/doc/People permanent;
+rewrite ^/cd_submission\.html$ $mb_server/doc/Disc_Submission permanent;
+rewrite ^/client_howto\.html$ $mb_server/doc/Client_HOWTO permanent;
+rewrite ^/contract\.html$ $mb_server/doc/Social_Contract permanent;
+rewrite ^/contribute\.html$ $mb_server/doc/Contribute permanent;
+rewrite ^/db_structure\.html$ $mb_server/doc/Database_Schema permanent;
+rewrite ^/development/mmd$ $mb_server/doc/XML_Web_Service permanent;
+rewrite ^/development/mmd/(.*)$ $mb_server/doc/XML_Web_Service permanent;
+rewrite ^/disc\.html$ $mb_server/doc/Disc_ID_Calculation permanent;
+rewrite ^/documentation\.html$ $mb_server/doc/MusicBrainz_Documentation permanent;
+rewrite ^/download\.html$ $mb_server/doc/Products permanent;
+rewrite ^/faq\.html$ $mb_server/doc/Frequently_Asked_Questions permanent;
+rewrite ^/fmc$ $mb_server/doc/FutureOfMusicWelcomePage ;
+rewrite ^/history\.html$ $mb_server/doc/MusicBrainz_History permanent;
+rewrite ^/how\.html$ $mb_server/doc/How_MusicBrainz_Works permanent;
+rewrite ^/introduction\.html$ $mb_server/doc/About_MusicBrainz permanent;
+rewrite ^/license\.html$ $mb_server/doc/Database_License_White_Paper permanent;
+rewrite ^/list\.html$ $mb_server/doc/Mailing_List permanent;
+rewrite ^/mm/mm-2\.1$ $mb_server/doc/Client_HOWTO last;
+rewrite ^/mm/mq-1\.1$ $mb_server/doc/Client_HOWTO last;
+rewrite ^/mod_faq\.html$ $mb_server/doc/Editing_FAQ permanent;
+rewrite ^/mod_intro\.html$ $mb_server/doc/How_Editing_Works permanent;
+rewrite ^/news/licenses\.html$ $mb_server/doc/MusicBrainz_License permanent;
+rewrite ^/press\.html$ $mb_server/doc/MusicBrainz_Press permanent;
+rewrite ^/privacy$ $mb_server/doc/MusicBrainz_Privacy_Policy permanent;
+rewrite ^/products/libdiscid$ $mb_server/doc/libdiscid permanent;
+rewrite ^/products/libmusicbrainz$ $mb_server/doc/libmusicbrainz permanent;
+rewrite ^/products/picard/index\.html$ $mb_server/doc/Picard_Documentation permanent;
+rewrite ^/products/picard/tutorial/index\.html$ $mb_server/doc/Picard_Tutorial permanent;
+rewrite ^/products/python-musicbrainz2 $mb_server/doc/python-musicbrainz2 permanent;
+rewrite ^/products/server/docs/20031226-1\.html$ $mb_server/doc/Advanced_Search permanent;
+rewrite ^/products/tunepimp/index\.html$ $mb_server/doc/libtunepimp permanent;
+rewrite ^/products/tunepimp$ $mb_server/doc/libtunepimp permanent;
+rewrite ^/products/tunepimp/download\.html$ $mb_server/doc/libtunepimp_Download permanent;
+rewrite ^/support/contact\.html$ $mb_server/doc/Contact_Us permanent;
+rewrite ^/style\.html$ $mb_server/doc/Style_Guidelines permanent;
+rewrite ^/tagger/ $mb_server/doc/Classic_Tagger permanent; # redirect all tagger pages
# Pages moved after NGS
-rewrite "^/recording/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/puids$" /recording/$1/fingerprints permanent;
+rewrite "^/recording/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/puids$" $mb_server/recording/$1/fingerprints permanent;
# Permalinks
-rewrite "^/album/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(\.html)?$" /release/$1 permanent;
-rewrite "^/track/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(\.html)?$" /recording/$1 permanent;
-rewrite "^/(artist|release-group|release|label|recording|work)\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.html$" /$1/$2 permanent;
+rewrite "^/album/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(\.html)?$" $mb_server/release/$1 permanent;
+rewrite "^/track/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(\.html)?$" $mb_server/recording/$1 permanent;
+rewrite "^/(artist|release-group|release|label|recording|work)\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.html$" $mb_server/$1/$2 permanent;
# Removing index.html makes our regexes easier
-rewrite ^\/(.*\/)index\.html$ /$1 ;
+rewrite ^\/(.*\/)index\.html$ $mb_server/$1 ;
# These are from before the "bad terminology" changes and reorganisation
-rewrite ^/albumdetail\.html$ /show/release/details.html ;
-rewrite ^/artistinfo\.html$ /show/artist/details.html ;
-rewrite ^/perm_links\.html$ /show/permlink.html ;
-rewrite ^/showalbum\.html$ /show/release/ ;
-rewrite ^/showaliases\.html$ /show/artist/aliases.html ;
-rewrite ^/showartist\.html$ /show/artist/ ;
-rewrite ^/showcdtoc\.html$ /show/cdtoc/ ;
-rewrite ^/showlabel\.html$ /show/label/ ;
-rewrite ^/showmod\.html$ /show/edit/ ;
-rewrite ^/showpuid\.html$ /show/puid/ ;
-rewrite ^/stats\.html$ /show/stats/ ;
-rewrite ^/showtrack\.html$ /show/track/ ;
-rewrite ^/showurl\.html$ /show/url/ ;
+rewrite ^/albumdetail\.html$ $mb_server/show/release/details.html ;
+rewrite ^/artistinfo\.html$ $mb_server/show/artist/details.html ;
+rewrite ^/perm_links\.html$ $mb_server/show/permlink.html ;
+rewrite ^/showalbum\.html$ $mb_server/show/release/ ;
+rewrite ^/showaliases\.html$ $mb_server/show/artist/aliases.html ;
+rewrite ^/showartist\.html$ $mb_server/show/artist/ ;
+rewrite ^/showcdtoc\.html$ $mb_server/show/cdtoc/ ;
+rewrite ^/showlabel\.html$ $mb_server/show/label/ ;
+rewrite ^/showmod\.html$ $mb_server/show/edit/ ;
+rewrite ^/showpuid\.html$ $mb_server/show/puid/ ;
+rewrite ^/stats\.html$ $mb_server/show/stats/ ;
+rewrite ^/showtrack\.html$ $mb_server/show/track/ ;
+rewrite ^/showurl\.html$ $mb_server/show/url/ ;
# FreeDB import pages are sometimes linked from edit notes
location /freedb/import.html {
if ($args ~ "catid=([a-z]+)/([a-z0-9]+)") {
set $category $1;
set $freedbid $2;
- rewrite ^/freedb/import\.html$ /freedb/$category/$freedbid permanent;
+ rewrite ^/freedb/import\.html$ $mb_server/freedb/$category/$freedbid permanent;
}
}
@@ -120,42 +125,42 @@ location /freedb/import.html {
# UUIDs are clearly not row IDs though so doing a partial match should be OK.
if ($args ~ "id=([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})") {
set $uuid $1;
- rewrite ^/show/artist/$ /artist/$uuid permanent;
- rewrite ^/show/artist/appears-on\.html$ /artist/$uuid/relationships permanent;
- rewrite ^/show/artist/relationships\.html$ /artist/$uuid/relationships permanent;
- rewrite ^/show/artist/releases\.html$ /artist/$uuid/releases permanent;
- rewrite ^/show/label/$ /label/$uuid permanent;
- rewrite ^/show/label/relationships\.html$ /label/$uuid/relationships permanent;
- rewrite ^/show/permlink\.html$ /otherlookup?mbid=$uuid permanent; # use the MBID lookup instead of faffing about with arguments
- rewrite ^/show/puid/$ /puid/$uuid permanent;
- rewrite ^/show/release-group/$ /release-group/$uuid permanent;
- rewrite ^/show/release-group/details\.html$ /release-group/$uuid/details permanent;
- rewrite ^/show/release/$ /release/$uuid permanent;
- rewrite ^/show/release/details\.html$ /release/$uuid/details permanent;
- rewrite ^/show/release/relationships\.html$ /release/$uuid/relationships permanent;
- rewrite ^/show/track/$ /recording/$uuid permanent;
- rewrite ^/show/track/relationships\.html$ /recording/$uuid/relationships permanent;
+ rewrite ^/show/artist/$ $mb_server/artist/$uuid permanent;
+ rewrite ^/show/artist/appears-on\.html$ $mb_server/artist/$uuid/relationships permanent;
+ rewrite ^/show/artist/relationships\.html$ $mb_server/artist/$uuid/relationships permanent;
+ rewrite ^/show/artist/releases\.html$ $mb_server/artist/$uuid/releases permanent;
+ rewrite ^/show/label/$ $mb_server/label/$uuid permanent;
+ rewrite ^/show/label/relationships\.html$ $mb_server/label/$uuid/relationships permanent;
+ rewrite ^/show/permlink\.html$ $mb_server/otherlookup?mbid=$uuid permanent; # use the MBID lookup instead of faffing about with arguments
+ rewrite ^/show/puid/$ $mb_server/puid/$uuid permanent;
+ rewrite ^/show/release-group/$ $mb_server/release-group/$uuid permanent;
+ rewrite ^/show/release-group/details\.html$ $mb_server/release-group/$uuid/details permanent;
+ rewrite ^/show/release/$ $mb_server/release/$uuid permanent;
+ rewrite ^/show/release/details\.html$ $mb_server/release/$uuid/details permanent;
+ rewrite ^/show/release/relationships\.html$ $mb_server/release/$uuid/relationships permanent;
+ rewrite ^/show/track/$ $mb_server/recording/$uuid permanent;
+ rewrite ^/show/track/relationships\.html$ $mb_server/recording/$uuid/relationships permanent;
}
if ($args ~ "discid=([A-Za-z0-9_.]{27}-)") {
set $discid $1;
- rewrite ^/show/release/$ /cdtoc/$discid? permanent;
- rewrite ^/show/cdstub/$ /cdstub/$discid? permanent;
+ rewrite ^/show/release/$ $mb_server/cdtoc/$discid? permanent;
+ rewrite ^/show/cdstub/$ $mb_server/cdstub/$discid? permanent;
}
if ($args ~ "isrc=([A-Z0-9]{12})") {
set $isrc $1;
- rewrite ^/show/isrc/$ /isrc/$isrc? permanent;
+ rewrite ^/show/isrc/$ $mb_server/isrc/$isrc? permanent;
}
if ($args ~ "username=(.+)") {
set $username $1;
- rewrite ^/show/user/$ /user/$username? permanent;
+ rewrite ^/show/user/$ $mb_server/user/$username? permanent;
}
if ($args ~ "tag=([^&]+)") {
set $tag $1;
- rewrite ^/show/tag/$ /tag/$tag permanent; # doesn't handle show=all, show=release, etc
+ rewrite ^/show/tag/$ $mb_server/tag/$tag permanent; # doesn't handle show=all, show=release, etc
}
# Pages with row IDs
@@ -163,96 +168,96 @@ if ($args ~ "tag=([^&]+)") {
if ($args ~ "id=([0-9]+)") {
set $id $1;
- rewrite ^/edit/album/add\.html$ /artist/$id/add_release permanent; # mostly here for the add various artists release page
+ rewrite ^/edit/album/add\.html$ $mb_server/artist/$id/add_release permanent; # mostly here for the add various artists release page
- rewrite ^/show/artist/$ /artist/$id permanent;
- rewrite ^/show/artist/aliases\.html$ /artist/$id/aliases permanent;
- rewrite ^/show/artist/appears-on\.html$ /artist/$id/relationships permanent;
- rewrite ^/show/artist/details\.html$ /artist/$id/details permanent;
- rewrite ^/show/artist/relationships\.html$ /artist/$id/relationships permanent;
- rewrite ^/show/artist/releases\.html$ /artist/$id/releases permanent;
- rewrite ^/show/artist/tags\.html$ /artist/$id/tags permanent;
+ rewrite ^/show/artist/$ $mb_server/artist/$id permanent;
+ rewrite ^/show/artist/aliases\.html$ $mb_server/artist/$id/aliases permanent;
+ rewrite ^/show/artist/appears-on\.html$ $mb_server/artist/$id/relationships permanent;
+ rewrite ^/show/artist/details\.html$ $mb_server/artist/$id/details permanent;
+ rewrite ^/show/artist/relationships\.html$ $mb_server/artist/$id/relationships permanent;
+ rewrite ^/show/artist/releases\.html$ $mb_server/artist/$id/releases permanent;
+ rewrite ^/show/artist/tags\.html$ $mb_server/artist/$id/tags permanent;
- rewrite ^/show/edit/$ /edit/$id? permanent;
+ rewrite ^/show/edit/$ $mb_server/edit/$id? permanent;
- rewrite ^/show/label/$ /label/$id permanent;
- rewrite ^/show/label/aliases\.html$ /label/$id/aliases permanent;
- rewrite ^/show/label/details\.html$ /label/$id/details permanent;
- rewrite ^/show/label/relationships\.html$ /label/$id/relationships permanent;
- rewrite ^/show/label/tags\.html$ /label/$id/tags permanent;
+ rewrite ^/show/label/$ $mb_server/label/$id permanent;
+ rewrite ^/show/label/aliases\.html$ $mb_server/label/$id/aliases permanent;
+ rewrite ^/show/label/details\.html$ $mb_server/label/$id/details permanent;
+ rewrite ^/show/label/relationships\.html$ $mb_server/label/$id/relationships permanent;
+ rewrite ^/show/label/tags\.html$ $mb_server/label/$id/tags permanent;
- rewrite ^/show/release-group/$ /release-group/$id permanent;
- rewrite ^/show/release-group/details\.html$ /release-group/$id/details permanent;
+ rewrite ^/show/release-group/$ $mb_server/release-group/$id permanent;
+ rewrite ^/show/release-group/details\.html$ $mb_server/release-group/$id/details permanent;
- rewrite ^/show/release/$ /tracklist/$id permanent;
- rewrite ^/show/release/details\.html$ /tracklist/$id permanent;
- rewrite ^/show/release/relationships\.html$ /tracklist/$id permanent;
+ rewrite ^/show/release/$ $mb_server/tracklist/$id permanent;
+ rewrite ^/show/release/details\.html$ $mb_server/tracklist/$id permanent;
+ rewrite ^/show/release/relationships\.html$ $mb_server/tracklist/$id permanent;
- rewrite ^/show/track/$ /recording/$id permanent;
- rewrite ^/show/track/relationships\.html$ /recording/$id/relationships permanent;
- rewrite ^/show/track/tags\.html$ /recording/$id/tags permanent;
+ rewrite ^/show/track/$ $mb_server/recording/$id permanent;
+ rewrite ^/show/track/relationships\.html$ $mb_server/recording/$id/relationships permanent;
+ rewrite ^/show/track/tags\.html$ $mb_server/recording/$id/tags permanent;
- rewrite ^/show/url/$ /url/$id permanent;
- rewrite ^/show/url/relationships\.html$ /url/$id/relationships permanent;
+ rewrite ^/show/url/$ $mb_server/url/$id permanent;
+ rewrite ^/show/url/relationships\.html$ $mb_server/url/$id/relationships permanent;
}
# Other pages
-rewrite ^/bare/cdlookup\.html$ /cdtoc/attach permanent;
-rewrite ^/browseartists\.html$ /browse/artist permanent;
-rewrite ^/browselabels\.html$ /browse/label permanent;
-rewrite ^/browsevarious\.html$ /browse/release permanent;
-rewrite ^/edit/artist/add\.html$ /artist/create permanent;
-rewrite ^/edit/label/add\.html$ /label/create permanent;
-rewrite ^/reports/ /report permanent; # redirect all of the reports to the index
-rewrite ^/report/?$ /reports permanent; # redirect the index
-rewrite ^/search/plugins/install\.html$ /search/plugins permanent;
-rewrite ^/show/cdstub/topstubs\.html$ /cdstub/browse permanent;
+rewrite ^/bare/cdlookup\.html$ $mb_server/cdtoc/attach permanent;
+rewrite ^/browseartists\.html$ $mb_server/browse/artist permanent;
+rewrite ^/browselabels\.html$ $mb_server/browse/label permanent;
+rewrite ^/browsevarious\.html$ $mb_server/browse/release permanent;
+rewrite ^/edit/artist/add\.html$ $mb_server/artist/create permanent;
+rewrite ^/edit/label/add\.html$ $mb_server/label/create permanent;
+rewrite ^/reports/ $mb_server/report permanent; # redirect all of the reports to the index
+rewrite ^/report/?$ $mb_server/reports permanent; # redirect the index
+rewrite ^/search/plugins/install\.html$ $mb_server/search/plugins permanent;
+rewrite ^/show/cdstub/topstubs\.html$ $mb_server/cdstub/browse permanent;
#rewrite ^/show/stats/ # not implemented
#rewrite ^/show/stats/dashboard\.html # not implemented
#rewrite ^/show/stats/musicnews\.html # not implemented
#rewrite ^/show/stats/timeline\.html # not implemented
-rewrite ^/show/tag/all\.html$ /tag/ permanent;
+rewrite ^/show/tag/all\.html$ $mb_server/tag/ permanent;
#rewrite ^/show/tag/related\.html$ # not implemented
#rewrite ^/topmods\.html$ # not implemented
#rewrite ^/user/election/show\.html$ # not implemented
# Account pages
-rewrite ^/createlogin\.html$ /register permanent;
-rewrite ^/login\.html$ /login permanent;
-rewrite ^/logout\.html$ /logout permanent;
-rewrite ^/newlogin\.html$ /register permanent;
-rewrite ^/prefs\.html$ /account/preferences permanent;
-rewrite ^/register\.html$ /register permanent;
+rewrite ^/createlogin\.html$ $mb_server/register permanent;
+rewrite ^/login\.html$ $mb_server/login permanent;
+rewrite ^/logout\.html$ $mb_server/logout permanent;
+rewrite ^/newlogin\.html$ $mb_server/register permanent;
+rewrite ^/prefs\.html$ $mb_server/account/preferences permanent;
+rewrite ^/register\.html$ $mb_server/register permanent;
#rewrite ^/user/collectionpreferences\.html$ # not implemented
-rewrite ^/user/edit\.html$ /account/edit permanent;
-rewrite ^/user/forgot-password\.html$ /lost-password permanent;
-rewrite ^/user/preferences\.html$ /account/preferences permanent;
-rewrite ^/user/register\.html$ /register permanent;
+rewrite ^/user/edit\.html$ $mb_server/account/edit permanent;
+rewrite ^/user/forgot-password\.html$ $mb_server/lost-password permanent;
+rewrite ^/user/preferences\.html$ $mb_server/account/preferences permanent;
+rewrite ^/user/register\.html$ $mb_server/register permanent;
# Search pages
# the changes in parameter names hasn't been handled...
-rewrite ^/search\.html$ /search permanent;
-rewrite ^/search/oldsearch\.html$ /search?direct=1 permanent;
-rewrite ^/search/textsearch\.html$ /search permanent;
-rewrite ^/newsearch\.html$ /search? permanent; # use ? to ignore the parameters because they're totally different
-rewrite ^/taglookup\.html$ /taglookup permanent;
+rewrite ^/search\.html$ $mb_server/search permanent;
+rewrite ^/search/oldsearch\.html$ $mb_server/search?direct=1 permanent;
+rewrite ^/search/textsearch\.html$ $mb_server/search permanent;
+rewrite ^/newsearch\.html$ $mb_server/search? permanent; # use ? to ignore the parameters because they're totally different
+rewrite ^/taglookup\.html$ $mb_server/taglookup permanent;
# Edit search pages
-rewrite ^/mod/search/$ /search/edits permanent;
-rewrite ^/mod/search/results\.html$ /search/edits permanent; # assumes the new edit search will understand the same parameters
-rewrite ^/mod/search/select-filter\.html /search/edits permanent; # actually a page with all sorts of edit searches
+rewrite ^/mod/search/$ $mb_server/search/edits permanent;
+rewrite ^/mod/search/results\.html$ $mb_server/search/edits permanent; # assumes the new edit search will understand the same parameters
+rewrite ^/mod/search/select-filter\.html $mb_server/search/edits permanent; # actually a page with all sorts of edit searches
# Admin rewrites
-rewrite ^/edit/wikitransclusion/transclusion.html$ /admin/wikidoc permanent;
-rewrite ^/edit/relationships/link_type_roots.html$ /relationships permanent;
-rewrite ^/edit/relationships/link_attrs.html$ /relationships/attributes permanent;
-rewrite ^/admin/linktype$ /relationships permanent;
-rewrite ^/admin/linkattributetype$ /relationships/attributes permanent;
-rewrite ^/show/edit/conditions\.html$ /doc/Edit_Types permanent;
-rewrite ^/show/stats$ /statistics permanent;
+rewrite ^/edit/wikitransclusion/transclusion.html$ $mb_server/admin/wikidoc permanent;
+rewrite ^/edit/relationships/link_type_roots.html$ $mb_server/relationships permanent;
+rewrite ^/edit/relationships/link_attrs.html$ $mb_server/relationships/attributes permanent;
+rewrite ^/admin/linktype$ $mb_server/relationships permanent;
+rewrite ^/admin/linkattributetype$ $mb_server/relationships/attributes permanent;
+rewrite ^/show/edit/conditions\.html$ $mb_server/doc/Edit_Types permanent;
+rewrite ^/show/stats$ $mb_server/statistics permanent;
# Rewrite for web service documentation
-rewrite ^/ws/2/?$ /doc/XML_Web_Service/Version_2 permanent;
+rewrite ^/ws/2/?$ $mb_server/doc/XML_Web_Service/Version_2 permanent;
##########
# Not redirected
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server