aidar/SHiNE-server
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'git2/main' into migration-postgres

Browse Source 
# Conflicts:
#	VERSION.properties
#	deploy/scripts/production_server2_ui.sh
This commit is contained in:
AidarKC
2026-07-30 09:47:28 +04:00
parent 143adcbbe4 809c216a5c
commit 7d475ab403
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION.properties
+2 -2
View File
@@ -1,2 +1,2 @@
client.version=1.2.359 client.version=1.3.1
server.version=1.2.342 server.version=1.3.1
deploy/scripts/production_server2_ui.sh
+1 -1
View File
@@ -8,7 +8,7 @@ EXPECTED_CADDY_SITE="server2.shineup.me" \
DEPLOY_SERVER_LOGIN="server2shineupme" \ DEPLOY_SERVER_LOGIN="server2shineupme" \
DEPLOY_SERVER_ADDRESS="server2.shineup.me" \ DEPLOY_SERVER_ADDRESS="server2.shineup.me" \
DEPLOY_SOLANA_CLUSTER="mainnet" \ DEPLOY_SOLANA_CLUSTER="mainnet" \
DEPLOY_SOLANA_ENDPOINT="https://mainnet.helius-rpc.com/?api-key=5e1bfa84-b376-4aa6-8a7b-4a4250181622" \ DEPLOY_SOLANA_ENDPOINT="https://public.rpc.solanavibestation.com/" \
TARGET_URL="https://server2.shineup.me" \ TARGET_URL="https://server2.shineup.me" \
REQUIRE_BACKUP="1" \ REQUIRE_BACKUP="1" \
bash "$(dirname "$0")/deploy_ui.sh" bash "$(dirname "$0")/deploy_ui.sh"
deploy/scripts/production_shineupme_ui.sh
+1 -1
View File
@@ -8,7 +8,7 @@ EXPECTED_CADDY_SITE="shineup.me" \
DEPLOY_SERVER_LOGIN="shineupme" \ DEPLOY_SERVER_LOGIN="shineupme" \
DEPLOY_SERVER_ADDRESS="shineup.me" \ DEPLOY_SERVER_ADDRESS="shineup.me" \
DEPLOY_SOLANA_CLUSTER="mainnet" \ DEPLOY_SOLANA_CLUSTER="mainnet" \
DEPLOY_SOLANA_ENDPOINT="https://solana-rpc.publicnode.com" \ DEPLOY_SOLANA_ENDPOINT="https://public.rpc.solanavibestation.com/" \
TARGET_URL="https://shineup.me" \ TARGET_URL="https://shineup.me" \
REQUIRE_BACKUP="1" \ REQUIRE_BACKUP="1" \
bash "$(dirname "$0")/deploy_ui.sh" bash "$(dirname "$0")/deploy_ui.sh"