From f6299e4e9dcf0c951b0f2fa315860d6c0312d27c Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Wed, 16 Jun 2021 15:58:52 +0200 Subject: [PATCH] use SKYNET_SERVER_API in discord bot --- setup-scripts/bot_utils.py | 2 +- setup-scripts/setup-docker-services.sh | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/setup-scripts/bot_utils.py b/setup-scripts/bot_utils.py index 9e918955..841d9ccd 100644 --- a/setup-scripts/bot_utils.py +++ b/setup-scripts/bot_utils.py @@ -53,7 +53,7 @@ def setup(): bot_token = os.environ["DISCORD_BOT_TOKEN"] global portal_name - portal_name = os.getenv("PORTAL_NAME") + portal_name = os.getenv("SKYNET_SERVER_API") # Get a port or use default global port diff --git a/setup-scripts/setup-docker-services.sh b/setup-scripts/setup-docker-services.sh index c2270b3c..84b75ddd 100755 --- a/setup-scripts/setup-docker-services.sh +++ b/setup-scripts/setup-docker-services.sh @@ -22,15 +22,16 @@ docker-compose --version # sanity check # Create dummy .env file for docker-compose usage with variables # * SSL_CERTIFICATE_STRING - certificate string that will be used to generate ssl certificates, read more in docker/caddy/Caddyfile -# * SKYNET_PORTAL_API - absolute url to the portal api ie. https://example.com -# * SKYNET_DASHBOARD_URL - (optional) absolute url to the portal dashboard ie. https://account.example.com +# * SKYNET_PORTAL_API - absolute url to the portal api ie. https://siasky.net (general portal address) +# * SKYNET_SERVER_API - absolute url to the server api ie. https://eu-ger-1.siasky.net (direct server address, if this is single server portal use the same address as SKYNET_PORTAL_API) +# * SKYNET_DASHBOARD_URL - (optional) absolute url to the portal dashboard ie. https://account.siasky.net # * EMAIL_ADDRESS - this is the administrator contact email you need to supply for communication regarding SSL certification # * HSD_API_KEY - this is auto generated secure key for your handshake service integration # * CLOUDFLARE_AUTH_TOKEN - (optional) if using cloudflare as dns loadbalancer (need to change it in Caddyfile too) # * AWS_ACCESS_KEY_ID - (optional) if using route53 as a dns loadbalancer # * AWS_SECRET_ACCESS_KEY - (optional) if using route53 as a dns loadbalancer # * API_PORT - (optional) the port on which siad is listening, defaults to 9980 -# * PORTAL_NAME - the name of the portal, required by the discord bot +# * PORTAL_NAME - the name of the portal # * DISCORD_BOT_TOKEN - (optional) only required if you're using the discord notifications integration # * SKYNET_DB_USER - (optional) if using `accounts` this is the MongoDB username # * SKYNET_DB_PASS - (optional) if using `accounts` this is the MongoDB password @@ -43,7 +44,7 @@ docker-compose --version # sanity check # * CR_CLUSTER_NODES - (optional) if using `accounts` the list of servers (with ports) which make up your CockroachDB cluster, e.g. `helsinki.siasky.net:26257,germany.siasky.net:26257,us-east.siasky.net:26257` if ! [ -f /home/user/skynet-webportal/.env ]; then HSD_API_KEY=$(openssl rand -base64 32) # generate safe random key for handshake - printf "SSL_CERTIFICATE_STRING=example.com, *.example.com, *.hns.example.com\nSKYNET_PORTAL_API=https://example.com\nSKYNET_DASHBOARD_URL=https://account.example.com\nEMAIL_ADDRESS=email@example.com\nSIA_WALLET_PASSWORD=\nHSD_API_KEY=${HSD_API_KEY}\nCLOUDFLARE_AUTH_TOKEN=\nAWS_ACCESS_KEY_ID=\nAWS_SECRET_ACCESS_KEY=\nPORTAL_NAME=\nDISCORD_BOT_TOKEN=\n" > /home/user/skynet-webportal/.env + printf "SSL_CERTIFICATE_STRING=siasky.net, *.siasky.net, *.hns.siasky.net\nSKYNET_PORTAL_API=https://siasky.net\nSKYNET_SERVER_API=https://siasky.net\nSKYNET_DASHBOARD_URL=https://account.example.com\nEMAIL_ADDRESS=email@example.com\nSIA_WALLET_PASSWORD=\nHSD_API_KEY=${HSD_API_KEY}\nCLOUDFLARE_AUTH_TOKEN=\nAWS_ACCESS_KEY_ID=\nAWS_SECRET_ACCESS_KEY=\nPORTAL_NAME=\nDISCORD_BOT_TOKEN=\n" > /home/user/skynet-webportal/.env fi # Start docker container with nginx and client