diff --git a/scripts/subinstallers/extra/bitwarden.sh b/scripts/subinstallers/extra/bitwarden.sh index abc37a5..e8b30e9 100755 --- a/scripts/subinstallers/extra/bitwarden.sh +++ b/scripts/subinstallers/extra/bitwarden.sh @@ -3,4 +3,8 @@ # generate bitwarden .env files BITWARDEN_PROD_FILE="$1" echo "WEBSOCKET_ENABLED=true" > $BITWARDEN_PROD_FILE -echo "SIGNUPS_ALLOWED=true" >> $BITWARDEN_PROD_FILE \ No newline at end of file +echo "SIGNUPS_ALLOWED=true" >> $BITWARDEN_PROD_FILE + +echo "MISTBORN_SERVICE_DOMAIN=bitwarden.mistborn" >> $BITWARDEN_PROD_FILE +echo "MISTBORN_SERVICE_NAME=bitwarden" >> $BITWARDEN_PROD_FILE +echo "MISTBORN_SERVICE_PORT=80" >> $BITWARDEN_PROD_FILE \ No newline at end of file diff --git a/scripts/wrappers/mistborn_docker.sh b/scripts/wrappers/mistborn_docker.sh index 23c7480..f62bc42 100755 --- a/scripts/wrappers/mistborn_docker.sh +++ b/scripts/wrappers/mistborn_docker.sh @@ -25,16 +25,16 @@ fi set +a # call traefik-extra -if [[ ! -z "MISTBORN_SERVICE_NAME" ]] && \ - [[ ! -z "MISTBORN_SERVICE_DOMAIN" ]] && \ - [[ ! -z "MISTBORN_SERVICE_PORT" ]]; then +if [[ ! -z "${MISTBORN_SERVICE_NAME}" ]] && \ + [[ ! -z "${MISTBORN_SERVICE_DOMAIN}" ]] && \ + [[ ! -z "${MISTBORN_SERVICE_PORT}" ]]; then echo "Populating traefik routes" mistborn-cli traefik-extra \ - --domain-name $MISTBORN_SERVICE_DOMAIN \ - --service-name $MISTBORN_SERVICE_NAME \ - --web-port $MISTBORN_SERVICE_PORT + --domain-name ${MISTBORN_SERVICE_DOMAIN} \ + --service-name ${MISTBORN_SERVICE_NAME} \ + --web-port ${MISTBORN_SERVICE_PORT} else echo "Not populating traefik routes" fi