safebox/installer-tool
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LETSENCRYPT_SERVERNAME was added

Browse Source
This commit is contained in:
hael
2024-01-09 11:22:31 +00:00
parent bddbb2ac4f
commit 75ddf1124a
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deploy.sh
View File

@@ -255,7 +255,7 @@ for i in $(echo $PROXY_TYPE); do
echo "No email address given, Let's Encrypt will not work properly." echo "No email address given, Let's Encrypt will not work properly."
else else
TMP_FILE=$(mktemp -p /tmp/) TMP_FILE=$(mktemp -p /tmp/)
LETS_CONTENT=$(echo '"letsencrypt": {"EMAIL": "'$LETSENCRYPT_MAIL'","DOCKER_REGISTRY_URL": "'$DOCKER_REGISTRY_URL'"'}); LETS_CONTENT=$(echo '"letsencrypt": {"EMAIL": "'$LETSENCRYPT_MAIL'","SERVERNAME": "'$LETSENCRYPT_SERVERNAME'","DOCKER_REGISTRY_URL": "'$DOCKER_REGISTRY_URL'"'});
if [[ -f $USER_CONFIG_PATH ]]; then if [[ -f $USER_CONFIG_PATH ]]; then
TARGET=$(cat $USER_CONFIG_PATH | head -n-2); TARGET=$(cat $USER_CONFIG_PATH | head -n-2);

17
install.sh
View File

@@ -60,6 +60,12 @@ ask_envs() {
fi; fi;
echo "Invalid email address."; echo "Invalid email address.";
done done
echo "Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):";
read -r LETSENCRYPT_SERVERNAME;
if [ "$LETSENCRYPT_SERVERNAME" = "" ]; then
LETSENCRYPT_SERVERNAME="letsencrypt";
fi;
fi fi
echo "Cron? (Y/n)"; echo "Cron? (Y/n)";
@@ -465,19 +471,22 @@ ask_additionals() {
break; break;
fi; fi;
done done
echo "Please add Guacamole admin password: "; echo "Please add Guacamole admin password: ";
while read -r -s GUACAMOLE_ADMIN_PASSWORD; do while read -r -s GUACAMOLE_ADMIN_PASSWORD; do
if [ "$GUACAMOLE_ADMIN_PASSWORD" != "" ]; then if [ "$GUACAMOLE_ADMIN_PASSWORD" != "" ]; then
break; break;
fi; fi;
done done
echo "Do you want TOTP via login? (Y/n)"; echo "Do you want TOTP via login? (Y/n)";
read -r -s TOTP_USE; read -r TOTP_USE;
if [ "$TOTP_USE" == "" ] || [ "$TOTP_USE" == "y" ] || [ "$TOTP_USE" == "Y" ] ; then if [ "$TOTP_USE" == "" ] || [ "$TOTP_USE" == "y" ] || [ "$TOTP_USE" == "Y" ] ; then
TOTP_USE="true"; TOTP_USE="true";
fi; fi;
echo "Do you want limitation in case invalid login or password? Please add a number how many minutes for deny retry. If you add 0 means it will disabled. If just press enter means limitation will be set 5 minutes by default"; echo "Do you want limitation in case invalid login or password? Please add a number how many minutes for deny retry. If you add 0 means it will disabled. If just press enter means limitation will be set 5 minutes by default";
read -r -s BAN_DURATION; read -r BAN_DURATION;
if [ "$BAN_DURATION" == "" ] ; then if [ "$BAN_DURATION" == "" ] ; then
BAN_DURATION="5"; BAN_DURATION="5";
fi; fi;
@@ -667,7 +676,9 @@ if [ ! -f "/etc/user/config/system.json" ]; then
--volume $HOME/.ssh/installer:/root/.ssh/id_rsa \ --volume $HOME/.ssh/installer:/root/.ssh/id_rsa \
--volume /etc/user/:/etc/user/ \ --volume /etc/user/:/etc/user/ \
--volume /etc/system/:/etc/system/ \ --volume /etc/system/:/etc/system/ \
--env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL $DOCKER_REGISTRY_URL/installer-tool --env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL \
--env LETSENCRYPT_SERVERNAME=$LETSENCRYPT_SERVERNAME \
$DOCKER_REGISTRY_URL/installer-tool
fi; fi;