use protocol + domain + port to create base url
This commit is contained in:
+10
-5
@@ -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
|
||||
|
||||
|
||||
+6
-2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user