diff --git a/build1stTime.sh b/build1stTime.sh index 1c9e878..a57e257 100755 --- a/build1stTime.sh +++ b/build1stTime.sh @@ -1,24 +1,62 @@ #!/bin/bash -cat << EOF >.env -GITPROJECTNAME="serinty-website" -GITPROJECTUSER="Serinty" -GITSERVER="gogs.serinty.net" -GITSERVERPORT=22104 GITUSER="gogs" +read -e -r -i "$GITUSER" -p "Enter your git username: " GITUSER +GITPROJECTUSER="Serinty" +read -e -r -i "$GITPROJECTUSER" -p "Enter your git project username: " GITPROJECTUSER GITPROJECTNAME="serinty-website" +read -e -r -i "$GITPROJECTNAME" -p "Enter your git project name: " GITPROJECTNAME GITTHEMENAME="serinty-zola-theme" +read -e -r -i "$GITTHEMENAME" -p "Enter your theme name in the git repository: " GITTHEMENAME THEME_NAME=${GITTHEMENAME} -LOCALUSER="swsuser" -LOCALGROUP="swsgroup" +read -e -r -i "$THEME_NAME" -p "Enter your theme name: " THEME_NAME +GITSERVER="gogs.serinty.net" +read -e -r -i "$GITSERVER" -p "Enter your git server: " GITSERVER +GITSERVERPORT=22104 +read -e -r -i "$GITSERVERPORT" -p "Enter your git server port: " GITSERVERPORT SWSPORT=8970 +read -e -r -i "$SWSPORT" -p "Enter your webserver port: " SWSPORT +LOCALUSER="swsuser" +read -e -r -i "$LOCALUSER" -p "Enter local user running in container for the webserver: " LOCALUSER +LOCALGROUP="swsgroup" +read -e -r -i "$LOCALGROUP" -p "Enter local group running in container for the webserver: " LOCALGROUP +LOCALUSEREMAIL="swsuser@serinty.net" +read -e -r -i "$LOCALUSEREMAIL" -p "Enter local user email running in container for the webserver: " LOCALUSEREMAIL IDLE_TIME=86400 -OUTPUT_DIR="~/${GITPROJECTNAME}/public" +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 + + +cat << EOF >.env +GITUSER="$GITUSER" +GITPROJECTUSER="$GITPROJECTUSER" +GITPROJECTNAME="$GITPROJECTNAME" +GITTHEMENAME="$GITTHEMENAME" +THEME_NAME=${THEME_NAME} +GITSERVER="$GITSERVER" +GITSERVERPORT=$GITSERVERPORT +LOCALUSER="$LOCALUSER" +LOCALGROUP="$LOCALGROUP" +SWSPORT=$SWSPORT +IDLE_TIME=$IDLE_TIME +BASE_URL="$BASE_URL" +LOCALUSEREMAIL="$LOCALUSEREMAIL" EOF -ssh-keygen -q -t ed25519 -C "swsuser@serinty.net" -f ./id_ed25519 -docker secret create id_ed25519 id_ed25519 -docker secret create id_ed25519.pub id_ed25519.pub + +# Generate ssh key if there not exists +if [ ! -f ./id_ed25519 ]; then + ssh-keygen -q -t ed25519 -C "$LOCALUSEREMAIL" -f ./id_ed25519 +fi + +# Create docker secrets +# check if secret exists +if ! docker secret ls | grep -q "id_ed25519"; then + docker secret create id_ed25519 id_ed25519 +fi +if ! docker secret ls | grep -q "id_ed25519.pub"; then + docker secret create id_ed25519.pub id_ed25519.pub +fi echo "Copy this key to your repository:" cat id_ed25519.pub ssh-keygen -lf id_ed25519.pub diff --git a/git2zola.sh b/git2zola.sh index e848033..e08cfa2 100755 --- a/git2zola.sh +++ b/git2zola.sh @@ -40,7 +40,7 @@ GITCLONEURL=${GITCLONEURL:-"ssh://$GITUSER@$GITSERVER:$GITSERVERPORT/$GITPROJECT GITTHEMECLONEURL=${GITTHEMECLONEURL:-"ssh://$GITUSER@$GITSERVER:$GITSERVERPORT/$GITPROJECTUSER/$GITTHEMENAME.git"} BASE_URL=${BASE_URL:-"http://docker.local:${SWSPORT}"} # Zola output build and sws path -OUTPUT_DIR=${OUTPUT_DIR:-$HOME/$GITPROJECTNAME/public} +OUTPUT_DIR=${OUTPUT_DIR:-$HOME/$GITPROJECTUSER/$GITPROJECTNAME/public}