update_nginx.sh: add SUBDIR support

vz/azbyka/update_nginx.sh

@@ -36,17 +36,17 @@ cat <<EOF
     }
 
 
-    location = /$NAME/server-status/ {
+    location = /$SUBDIR/server-status/ {
         proxy_pass $UPSTREAM;
         include include/trans-proxy.conf;
         access_log  /var/log/nginx/$ACONF-access.log logdetail;
     }
 
-    location = /$NAME {
-        return 301 /$NAME/\$is_args\$args;
+    location = /$SUBDIR {
+        return 301 /$SUBDIR/\$is_args\$args;
     }
 
-    location /$NAME/ {
+    location /$SUBDIR/ {
         root $DROOT;
 
         # Вместо несуществующих jpg, png, gif отдаём приготовленную картинку
@@ -91,7 +91,7 @@ EOF
 
 TASK="$1"
 
-echo "$TASK" | grep -q "ves/" || TASK="ves/$1.task"
+echo "$TASK" | grep -q "ves[/-]" || TASK="ves/$1.task"
 
 load_config "$TASK"