Merge pull request #535 from bui/basedir

Add base directory support

tools/categories.json

@@ -16,7 +16,11 @@
 		"info_fill": "#004d68",
 		"bg_img": "bg_genre_0.png"
 	},
-	"aliases": null
+	"aliases": [
+		"jpop",
+		"j-pop",
+		"pops"
+	]
 },{
 	"id": 2,
 	"title": "Anime",
@@ -55,6 +59,7 @@
 		"ボーカロイド曲",
 		"ボーカロイド",
 		"vocaloid music",
+		"vocaloidmusic",
 		"vocaloid"
 	]
 },{
@@ -123,7 +128,10 @@
 		"info_fill": "#4f2886",
 		"bg_img": "bg_genre_5.png"
 	},
-	"aliases": null
+	"aliases": [
+		"game",
+		"gamemusic"
+	]
 },{
 	"id": 7,
 	"title": "NAMCO Original",
@@ -142,5 +150,8 @@
 		"info_fill": "#961e00",
 		"bg_img": "bg_genre_6.png"
 	},
-	"aliases": null
+	"aliases": [
+		"namco",
+		"namcooriginal"
+	]
 }]

tools/nginx_subdir.conf

@@ -0,0 +1,28 @@
+server {
+	listen 80;
+	#server_name taiko.example.com;
+	
+	location /taiko-web/ {
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header Host $server_name;
+		proxy_pass http://127.0.0.1:34801;
+	}
+	
+	location ~ ^/taiko-web/(assets|songs|src)/ {
+		rewrite ^/taiko-web/(.*) /$1 break;
+		root /srv/taiko-web/public;
+		location ~ ^/taiko-web/songs/([0-9]+)/preview\.mp3$ {
+			set $id $1;
+			rewrite ^/taiko-web/(.*) /$1 break;
+			try_files $uri /taiko-web/api/preview?id=$id;
+		}
+	}
+	
+	location /taiko-web/p2 {
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection "Upgrade";
+		proxy_pass http://127.0.0.1:34802;
+	}
+}