diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index ee0ac3cc3..88dfff6f5 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -49,6 +49,8 @@ KLICKTIPP_APIKEY_EN= DATABASE_CONFIG_VERSION=v1.2022-03-18 # frontend +FRONTEND_CONFIG_VERSION=v1.2022-03-18 + GRAPHQL_URI=https://stage1.gradido.net/graphql ADMIN_AUTH_URL=https://stage1.gradido.net/admin/authenticate?token={token} @@ -62,5 +64,7 @@ META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Econo META_AUTHOR="Bernd Hückstädt - Gradido-Akademie" # admin +ADMIN_CONFIG_VERSION=v1.2022-03-18 + WALLET_AUTH_URL=https://stage1.gradido.net/authenticate?token={token} WALLET_URL=https://stage1.gradido.net/login \ No newline at end of file diff --git a/deployment/bare_metal/setup.md b/deployment/bare_metal/setup.md index 55f657df2..f39228879 100644 --- a/deployment/bare_metal/setup.md +++ b/deployment/bare_metal/setup.md @@ -78,8 +78,8 @@ > git clone https://github.com/gradido/gradido.git # Timezone -# Note: This is not needed - UTC(default) is REQUIRED for production data -# > sudo timedatectl set-timezone UTC +# Note: This is needed - since there is Summer-Time included in the default server Setup - UTC is REQUIRED for production data +> sudo timedatectl set-timezone UTC # > sudo timedatectl set-ntp on # > sudo apt purge ntp # > sudo systemctl start systemd-timesyncd diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 250971419..03ba87445 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -67,7 +67,7 @@ BRANCH=${1:-master} echo "Starting with git pull - branch:$BRANCH" >> $UPDATE_HTML cd $PROJECT_ROOT # TODO: this overfetches alot, but ensures we can use start.sh with tags -git fetch origin --all +git fetch --all git checkout $BRANCH git pull export BUILD_COMMIT="$(git rev-parse HEAD)"