diff --git a/VERSION.properties b/VERSION.properties index 2dbb80e7..0613b3a3 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.2.354 +client.version=1.2.355 server.version=1.2.338 diff --git a/deploy/scripts/deploy_ui.sh b/deploy/scripts/deploy_ui.sh index f1924068..279e2605 100755 --- a/deploy/scripts/deploy_ui.sh +++ b/deploy/scripts/deploy_ui.sh @@ -15,6 +15,7 @@ DEPLOY_SERVER_LOGIN="${DEPLOY_SERVER_LOGIN:-}" DEPLOY_SERVER_ADDRESS="${DEPLOY_SERVER_ADDRESS:-}" DEPLOY_SOLANA_CLUSTER="${DEPLOY_SOLANA_CLUSTER:-}" DEPLOY_SOLANA_ENDPOINT="${DEPLOY_SOLANA_ENDPOINT:-}" +DEPLOY_WEBPUSH_VAPID_PUBLIC="${DEPLOY_WEBPUSH_VAPID_PUBLIC:-}" REQUIRE_BACKUP="${REQUIRE_BACKUP:-0}" BACKUP_DIR="${BACKUP_DIR:-$ROOT_DIR/deploy/backup/archive}" VERSION_FILE="$ROOT_DIR/VERSION.properties" @@ -72,7 +73,7 @@ if [[ -f "$DEPLOY_CONFIG_FILE" ]]; then if [[ -n "$DEPLOY_SOLANA_CLUSTER_NORMALIZED" ]]; then perl -0pi -e "s/export const defaultSolanaCluster = '.*?';/export const defaultSolanaCluster = '$DEPLOY_SOLANA_CLUSTER_NORMALIZED';/s" "$DEPLOY_CONFIG_FILE" fi - if [[ -n "$DEPLOY_SOLANA_ENDPOINT" ]]; then +if [[ -n "$DEPLOY_SOLANA_ENDPOINT" ]]; then perl -0pi -e "s|export const defaultSolanaEndpoint = '.*?';|export const defaultSolanaEndpoint = '$DEPLOY_SOLANA_ENDPOINT';|s" "$DEPLOY_CONFIG_FILE" fi fi @@ -85,6 +86,10 @@ fi perl -0pi -e 's/window\.__SHINE_BUILD_HASH__\s*=\s*'\''[^'\'']*'\'';/window.__SHINE_BUILD_HASH__ = '\''$ENV{BUILD_VERSION}'\'';/' "$INDEX_FILE" perl -0pi -e 's/window\.__SHINE_CLIENT_VERSION__\s*=\s*'\''[^'\'']*'\'';/window.__SHINE_CLIENT_VERSION__ = '\''$ENV{CLIENT_VERSION}'\'';/' "$INDEX_FILE" +if [[ -n "$DEPLOY_WEBPUSH_VAPID_PUBLIC" ]]; then + export DEPLOY_WEBPUSH_VAPID_PUBLIC + perl -0pi -e 's/window\.__SHINE_WEBPUSH_VAPID_PUBLIC_KEY__\s*=\s*'\''[^'\'']*'\'';/window.__SHINE_WEBPUSH_VAPID_PUBLIC_KEY__ = '\''$ENV{DEPLOY_WEBPUSH_VAPID_PUBLIC}'\'';/' "$INDEX_FILE" +fi echo "==> Checking SSH connectivity to $REMOTE_HOST" ssh -o BatchMode=yes -o ConnectTimeout=10 "$REMOTE_HOST" "echo SSH OK" >/dev/null diff --git a/deploy/scripts/production_server2_ui.sh b/deploy/scripts/production_server2_ui.sh index aa69af7f..2ab84ea6 100755 --- a/deploy/scripts/production_server2_ui.sh +++ b/deploy/scripts/production_server2_ui.sh @@ -8,7 +8,7 @@ EXPECTED_CADDY_SITE="server2.shineup.me" \ DEPLOY_SERVER_LOGIN="server2shineupme" \ DEPLOY_SERVER_ADDRESS="server2.shineup.me" \ DEPLOY_SOLANA_CLUSTER="mainnet" \ -DEPLOY_SOLANA_ENDPOINT="https://solana-rpc.publicnode.com" \ +DEPLOY_SOLANA_ENDPOINT="https://mainnet.helius-rpc.com/?api-key=5e1bfa84-b376-4aa6-8a7b-4a4250181622" \ TARGET_URL="https://server2.shineup.me" \ REQUIRE_BACKUP="1" \ bash "$(dirname "$0")/deploy_ui.sh"