From 0dab99acfb9e68a4f4a922362499285642661e4a Mon Sep 17 00:00:00 2001 From: status404 Date: Tue, 5 Sep 2023 15:06:29 +0300 Subject: [PATCH] Docker fix --- docker/entrypoint.sh | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index ace57db..023f03f 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -11,7 +11,12 @@ DM_FORWEB=${DM_FORWEB:-https://127.0.0.1} DM_WEBAUTH=${DM_WEBAUTH:-0} DM_TESTNET=${DM_TESTNET:-0} DM_LC_ALL=${DM_LC_ALL:-"en_US.UTF-8"} -DM_TZ=${DM_TZ:-"UTC"} +DM_TZ=${DM_TZ:-"Etc/UTC"} + +DM_OAUTH_WEB_SECRET="${DM_OAUTH_WEB_SECRET:-vTcvnpHbTmxxGP8AfRTHETXG}" +DM_OAUTH_MODULE_SECRET="${DM_OAUTH_MODULE_SECRET:-6DbqdnrJEDeSmaBMuZZde9ec}" +DM_OAUTH_WEB_SECRET_TESTNET="${DM_OAUTH_WEB_SECRET_TESTNET:-4aJEJi3dsSypeUSRCah4gIIs}" +DM_OAUTH_MODULE_SECRET_TESTNET="${DM_OAUTH_MODULE_SECRET_TESTNET:-TypQHP4TK44khO3cvOyuHYg3}" ## Daemon config files CONF_FILES=$(find /etc/dm/ -type f -name "*.conf" -not -name "default.conf") @@ -22,6 +27,7 @@ BX_CONF_FILE="/usr/local/etc/libbitcoin/bx.cfg" WEB_CONF_FILE="/var/www/web/config.js" WEB_CONF_SITES="/etc/dm/sites/default.json" WEB_CONF_OAUTH="/etc/dm/oauth2/default.json" +WEB_CONF_OAUTH_SERVICE="/etc/dm/oauth2/service.json" WEB_CERT="$UHOME/ssl-fullchain.pem" WEB_KEY="$UHOME/ssl-privkey.pem" WEB_DH="/etc/ssl/dhparam.pem" @@ -34,14 +40,13 @@ set_locale() { ## Setup locale if [ "$DM_LC_ALL" ]; then - LC_ALL="$DM_LC_ALL" - update-locale + update-locale LC_ALL="$DM_LC_ALL" LANG="$DM_LC_ALL" fi ## Setup Timezone if [ "$DM_TZ" ]; then echo $DM_TZ > /etc/timezone - ln -snf /usr/share/zoneinfo/$TZ /etc/localtime + ln -snf /usr/share/zoneinfo/$DM_TZ /etc/localtime dpkg-reconfigure -f noninteractive tzdata fi } @@ -72,6 +77,18 @@ init_config() sed -i 's/defaultLanguage:.*/defaultLanguage: "en",/' $WEB_CONF_FILE fi + if [ "$DM_TESTNET" = 1 -o "$DM_TESTNET" = true ]; then + cat $WEB_CONF_OAUTH_SERVICE | \ + jq --arg i $DM_OAUTH_MODULE_SECRET_TESTNET '.client_secret=$i' | sponge $WEB_CONF_OAUTH_SERVICE + cat $WEB_CONF_OAUTH | \ + jq --arg i $DM_OAUTH_WEB_SECRET_TESTNET '.web.client_secret=$i' | sponge $WEB_CONF_OAUTH + else + cat $WEB_CONF_OAUTH_SERVICE | \ + jq --arg i $DM_OAUTH_MODULE_SECRET '.client_secret=$i' | sponge $WEB_CONF_OAUTH_SERVICE + cat $WEB_CONF_OAUTH | \ + jq --arg i $DM_OAUTH_WEB_SECRET '.web.client_secret=$i' | sponge $WEB_CONF_OAUTH + fi + ## Add DM_FORWEB to dm oauth config cat $WEB_CONF_OAUTH | \ jq --arg host "$(basename $DM_FORWEB)" '.web.redirect_uris=[