diff --git a/VERSION.properties b/VERSION.properties index ab8b1d5..c3de824 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.2.106 -server.version=1.2.99 +client.version=1.2.107 +server.version=1.2.100 diff --git a/build.gradle b/build.gradle index 318060c..2385265 100644 --- a/build.gradle +++ b/build.gradle @@ -196,11 +196,11 @@ tasks.register('deployServer', JavaExec) { // можно переопределить при запуске: // ./gradlew deployServer -Dit.remoteHost=... -Dit.wsUri=... dependsOn shadowJar - systemProperty "it.remoteHost", System.getProperty("it.remoteHost", "45.136.124.227") + systemProperty "it.remoteHost", System.getProperty("it.remoteHost", "shineup.me") systemProperty "it.remoteUser", System.getProperty("it.remoteUser", "player") systemProperty "it.remoteDir", System.getProperty("it.remoteDir", "/home/player/SHiNE/shine-server") systemProperty "it.service", System.getProperty("it.service", "shine-server") - systemProperty "it.localJar", System.getProperty("it.localJar", "SHiNE-server/build/libs/shine-server.jar") + systemProperty "it.localJar", System.getProperty("it.localJar", "build/libs/shine-server.jar") dependsOn testClasses } diff --git a/deploy_shine-PWA.sh b/deploy_shine-PWA.sh index 1005356..42021df 100755 --- a/deploy_shine-PWA.sh +++ b/deploy_shine-PWA.sh @@ -2,7 +2,7 @@ set -euo pipefail SRC_DIR="shine-UI" -REMOTE_HOST="${REMOTE_HOST:-player@45.136.124.227}" +REMOTE_HOST="${REMOTE_HOST:-player@shineup.me}" REMOTE_UI_DIR="${REMOTE_UI_DIR:-/home/player/SHiNE/shine-ui}" EXPECTED_CADDY_UI_ROOT="${EXPECTED_CADDY_UI_ROOT:-/home/player/SHiNE/shine-ui}" ALLOW_CADDY_MISMATCH="${ALLOW_CADDY_MISMATCH:-0}"