michael.heier/citadel-core
1
0
Fork 1
mirror of https://github.com/runcitadel/core.git synced 2024-11-11 16:30:38 +00:00
Code Issues Projects Releases Wiki Activity

More preparations for branch rename

Browse Source
This commit is contained in:
Aaron Dewes 2022-02-28 20:49:13 +01:00
parent 1e8e1aad8a
commit 58ddca9d09
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -143,7 +143,7 @@ services:
LND_CERT_FILE: /lnd/tls.cert LND_CERT_FILE: /lnd/tls.cert
LND_ADMIN_MACAROON_FILE: /lnd/data/chain/bitcoin/${BITCOIN_NETWORK}/admin.macaroon LND_ADMIN_MACAROON_FILE: /lnd/data/chain/bitcoin/${BITCOIN_NETWORK}/admin.macaroon
GITHUB_REPO: runcitadel/core GITHUB_REPO: runcitadel/core
GITHUB_BRANCH: ${UPDATE_CHANNEL:-"main"} GITHUB_BRANCH: ${UPDATE_CHANNEL:-"stable"}
VERSION_FILE: /info.json VERSION_FILE: /info.json
UPDATE_LOCK_FILE: /statuses/update-in-progress UPDATE_LOCK_FILE: /statuses/update-in-progress
BACKUP_STATUS_FILE: /statuses/backup-status.json BACKUP_STATUS_FILE: /statuses/backup-status.json

4
scripts/configure vendored
View File

@ -146,7 +146,7 @@ if os.path.isfile('../use-core-upstream') or os.path.isfile('./use-core-upstream
NGINX_PORT=os.environ.get('NGINX_PORT') or "80" NGINX_PORT=os.environ.get('NGINX_PORT') or "80"
NGINX_SSL_PORT=os.environ.get('NGINX_SSL_PORT') or "443" NGINX_SSL_PORT=os.environ.get('NGINX_SSL_PORT') or "443"
UPDATE_CHANNEL="main" UPDATE_CHANNEL="stable"
if reconfiguring: if reconfiguring:
if os.path.isfile('../.citadel'): if os.path.isfile('../.citadel'):
@ -174,7 +174,7 @@ if reconfiguring:
NGINX_SSL_PORT=dotenv['NGINX_SSL_PORT'] NGINX_SSL_PORT=dotenv['NGINX_SSL_PORT']
if NGINX_SSL_PORT == "80" and NGINX_PORT == "80": if NGINX_SSL_PORT == "80" and NGINX_PORT == "80":
NGINX_SSL_PORT="443" NGINX_SSL_PORT="443"
if 'UPDATE_CHANNEL' in dotenv: if 'UPDATE_CHANNEL' in dotenv and dotenv['UPDATE_CHANNEL'] != "main":
UPDATE_CHANNEL=dotenv['UPDATE_CHANNEL'] UPDATE_CHANNEL=dotenv['UPDATE_CHANNEL']
else: else:
# Generate RPC credentials # Generate RPC credentials

2
scripts/update/update
View File

@ -34,7 +34,7 @@ elif [[ "${1}" == "--repo" ]]; then
update_type="repo" update_type="repo"
descriptor="${2}" descriptor="${2}"
if [[ "${descriptor}" != *"#"* ]]; then if [[ "${descriptor}" != *"#"* ]]; then
descriptor="${descriptor}#${UPDATE_CHANNEL:-"main"}" descriptor="${descriptor}#${UPDATE_CHANNEL:-"stable"}"
fi fi
repo="${descriptor%%#*}" repo="${descriptor%%#*}"
branch="${descriptor#*#}" branch="${descriptor#*#}"