From 999a21faecd375850ff8a5f0be81beaccc5e673a Mon Sep 17 00:00:00 2001 From: Sven Jorns Date: Mon, 19 Jun 2023 17:45:03 +0300 Subject: [PATCH] use protocol + domain + port to create base url --- build1stTime.sh | 15 ++++++++++----- git2zola.sh | 8 ++++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/build1stTime.sh b/build1stTime.sh index a595abe..3e68b53 100755 --- a/build1stTime.sh +++ b/build1stTime.sh @@ -23,24 +23,29 @@ LOCALUSEREMAIL="swsuser@serinty.net" read -e -r -i "$LOCALUSEREMAIL" -p "Enter local user email running in container for the webserver: " LOCALUSEREMAIL IDLE_TIME=86400 read -e -r -i "$IDLE_TIME" -p "Enter your idle time: " IDLE_TIME -BASE_URL="http://docker.local:${SWSPORT}" -read -e -r -i "$BASE_URL" -p "Enter your base url: " BASE_URL - +BASE_DOMAIN=${BASE_DOMAIN:-"docker.local"} +read -e -r -i "$BASE_DOMAIN" -p "Enter your base domain: " BASE_DOMAIN +BASE_PROTOCOL=${BASE_PROTOCOL:-"http"} +read -e -r -i "$BASE_PROTOCOL" -p "Enter your server protocol (http/https): " BASE_PROTOCOL +GITBRANCHNAME="master" +read -e -r -i "$GITBRANCHNAME" -p "Enter your git branch name: " GITBRANCHNAME cat << EOF >.env GITUSER="$GITUSER" GITPROJECTUSER="$GITPROJECTUSER" GITPROJECTNAME="$GITPROJECTNAME" GITTHEMENAME="$GITTHEMENAME" -THEME_NAME=${THEME_NAME} +THEME_NAME="${THEME_NAME}" GITSERVER="$GITSERVER" GITSERVERPORT=$GITSERVERPORT LOCALUSER="$LOCALUSER" LOCALGROUP="$LOCALGROUP" SWSPORT=$SWSPORT IDLE_TIME=$IDLE_TIME -BASE_URL="$BASE_URL" +BASE_DOMAIN="${BASE_DOMAIN}" +BASE_PROTOCOL="${BASE_PROTOCOL}" LOCALUSEREMAIL="$LOCALUSEREMAIL" +GITBRANCHNAME="$GITBRANCHNAME" EOF diff --git a/git2zola.sh b/git2zola.sh index 06b42a9..0f0f4e3 100755 --- a/git2zola.sh +++ b/git2zola.sh @@ -38,11 +38,15 @@ GITPASSWD=${GITPASSWD:-gogspw} GITCLONEURL=${GITCLONEURL:-"ssh://$GITUSER@$GITSERVER:$GITSERVERPORT/$GITPROJECTUSER/$GITPROJECTNAME.git"} # url to clone zola data and config GITTHEMECLONEURL=${GITTHEMECLONEURL:-"ssh://$GITUSER@$GITSERVER:$GITSERVERPORT/$GITPROJECTUSER/$GITTHEMENAME.git"} -BASE_URL=${BASE_URL:-"http://docker.local:${SWSPORT}"} + +BASE_DOMAIN=${BASE_DOMAIN:-"docker.local"} +BASE_PROTOCOL=${BASE_PROTOCOL:-"http"} + +BASE_URL=${BASE_URL:-"${BASE_PROTOCOL}://${BASE_DOMAIN}:${SWSPORT}"} # Zola output build and sws path OUTPUT_DIR=${OUTPUT_DIR:-$HOME/$GITPROJECTUSER/$GITPROJECTNAME/public} -GITBRANCHNAME="master" +GITBRANCHNAME=${GITBRANCHNAME:-"master"} # set trap to exit this process # at this time only exit this process if it get a exit code