Первая версия вложенных файлов работает

deploy/SETUP_SERVER_FROM_ZERO.md

@@ -92,6 +92,12 @@ t2.shineup.me {
     reverse_proxy 127.0.0.1:7102
   }
 
+  # Зашифрованные вложения DM. Этот route должен идти в Java, а не в SPA.
+  @dmfiles path /dm-files /dm-files/*
+  handle @dmfiles {
+    reverse_proxy 127.0.0.1:7102
+  }
+
   handle {
     root * /home/player/t2/UI
     try_files {path} /index.html

deploy/backup/scheme/shineup.me/configs/Caddyfile

@@ -10,6 +10,11 @@ shineup.me {
     reverse_proxy 127.0.0.1:7070
   }
 
+  @dmfiles path /dm-files /dm-files/*
+  handle @dmfiles {
+    reverse_proxy 127.0.0.1:7070
+  }
+
   handle {
     root * /home/player/SHiNE/shine-ui
     try_files {path} /index.html
@@ -31,6 +36,11 @@ shineup.me {
     reverse_proxy 127.0.0.1:7070
   }
 
+  @dmfiles path /dm-files /dm-files/*
+  handle @dmfiles {
+    reverse_proxy 127.0.0.1:7070
+  }
+
   handle {
     root * /home/player/SHiNE/shine-ui
     try_files {path} /index.html

deploy/scripts/deploy_server.sh

@@ -9,6 +9,7 @@ TARGET_DOMAIN="${TARGET_DOMAIN:?TARGET_DOMAIN is required, example: shineup.me}"
 REMOTE_SERVER_DIR="${REMOTE_SERVER_DIR:?REMOTE_SERVER_DIR is required}"
 REMOTE_LOGS_DIR="${REMOTE_LOGS_DIR:-$REMOTE_SERVER_DIR/logs}"
 REMOTE_DATA_DIR="${REMOTE_DATA_DIR:-$REMOTE_SERVER_DIR/data}"
+REMOTE_DM_FILES_DIR="${REMOTE_DM_FILES_DIR:-}"
 REMOTE_SERVICE_NAME="${REMOTE_SERVICE_NAME:?REMOTE_SERVICE_NAME is required}"
 SERVER_PORT="${SERVER_PORT:?SERVER_PORT is required}"
 LOCAL_JAR="${LOCAL_JAR:-$ROOT_DIR/SHiNE-server/build/libs/shine-server.jar}"
@@ -54,7 +55,7 @@ Type=simple
 User=player
 Group=player
 WorkingDirectory=$REMOTE_SERVER_DIR
-ExecStart=/usr/bin/java -Dserver.port=$SERVER_PORT -jar $REMOTE_SERVER_DIR/shine-server.jar
+ExecStart=/usr/bin/java -Dserver.port=$SERVER_PORT${REMOTE_DM_FILES_DIR:+ -Ddm.files.storageDir=$REMOTE_DM_FILES_DIR} -jar $REMOTE_SERVER_DIR/shine-server.jar
 Restart=always
 RestartSec=3
 
@@ -62,7 +63,11 @@ RestartSec=3
 WantedBy=multi-user.target
 EOF
 
-ssh "$REMOTE_HOST" "mkdir -p '$REMOTE_SERVER_DIR' '$REMOTE_DATA_DIR' '$REMOTE_LOGS_DIR'"
+if [[ -n "$REMOTE_DM_FILES_DIR" ]]; then
+  ssh "$REMOTE_HOST" "mkdir -p '$REMOTE_SERVER_DIR' '$REMOTE_DATA_DIR' '$REMOTE_LOGS_DIR' '$REMOTE_DM_FILES_DIR'"
+else
+  ssh "$REMOTE_HOST" "mkdir -p '$REMOTE_SERVER_DIR' '$REMOTE_DATA_DIR' '$REMOTE_LOGS_DIR'"
+fi
 rsync -az --timeout=120 "$LOCAL_JAR" "$REMOTE_HOST:$REMOTE_SERVER_DIR/shine-server.jar"
 rsync -az "$TMP_DIR/$REMOTE_SERVICE_NAME.service" "$REMOTE_HOST:/tmp/$REMOTE_SERVICE_NAME.service"
 

deploy/scripts/test_t1_server.sh

@@ -4,6 +4,7 @@ set -euo pipefail
 REMOTE_HOST="player@t1.shineup.me" \
 TARGET_DOMAIN="t1.shineup.me" \
 REMOTE_SERVER_DIR="/home/player/t1/server" \
+REMOTE_DM_FILES_DIR="/home/player/test-dm-files" \
 REMOTE_SERVICE_NAME="shine-t1" \
 SERVER_PORT="7101" \
 bash "$(dirname "$0")/deploy_server.sh"

deploy/scripts/test_t2_server.sh

@@ -4,6 +4,7 @@ set -euo pipefail
 REMOTE_HOST="player@t2.shineup.me" \
 TARGET_DOMAIN="t2.shineup.me" \
 REMOTE_SERVER_DIR="/home/player/t2/server" \
+REMOTE_DM_FILES_DIR="/home/player/test-dm-files" \
 REMOTE_SERVICE_NAME="shine-t2" \
 SERVER_PORT="7102" \
 bash "$(dirname "$0")/deploy_server.sh"

deploy/scripts/test_t3_server.sh

@@ -4,6 +4,7 @@ set -euo pipefail
 REMOTE_HOST="player@t3.shineup.me" \
 TARGET_DOMAIN="t3.shineup.me" \
 REMOTE_SERVER_DIR="/home/player/t3/server" \
+REMOTE_DM_FILES_DIR="/home/player/test-dm-files" \
 REMOTE_SERVICE_NAME="shine-t3" \
 SERVER_PORT="7103" \
 bash "$(dirname "$0")/deploy_server.sh"

deploy/scripts/test_t4_server.sh

@@ -4,6 +4,7 @@ set -euo pipefail
 REMOTE_HOST="player@t4.shineup.me" \
 TARGET_DOMAIN="t4.shineup.me" \
 REMOTE_SERVER_DIR="/home/player/t4/server" \
+REMOTE_DM_FILES_DIR="/home/player/test-dm-files" \
 REMOTE_SERVICE_NAME="shine-t4" \
 SERVER_PORT="7104" \
 bash "$(dirname "$0")/deploy_server.sh"