From 37a814a0527943f5211213220eda1460ffd23e17 Mon Sep 17 00:00:00 2001 From: nicedevil007 <17103076+nicedevil007@users.noreply.github.com> Date: Sun, 9 Apr 2023 17:29:52 +0200 Subject: [PATCH] finished --- ct/alpine-vaultwarden.sh | 2 +- install/alpine-vaultwarden-install.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ct/alpine-vaultwarden.sh b/ct/alpine-vaultwarden.sh index 91843711..ac7310dd 100644 --- a/ct/alpine-vaultwarden.sh +++ b/ct/alpine-vaultwarden.sh @@ -73,7 +73,7 @@ function update_script() { exit ;; 2) - if NEWTOKEN=$(whiptail --passwordbox "Setup your ADMIN-TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3); then + if NEWTOKEN=$(whiptail --passwordbox "Setup your ADMIN_TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3); then if [[ -z "$NEWTOKEN" ]]; then exit-script; fi ADMINTOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -e -id -k 19456 -t 2 -p 1) if [[ -f /var/lib/vaultwarden/config.json ]]; then diff --git a/install/alpine-vaultwarden-install.sh b/install/alpine-vaultwarden-install.sh index 69ad9905..78a50433 100644 --- a/install/alpine-vaultwarden-install.sh +++ b/install/alpine-vaultwarden-install.sh @@ -19,18 +19,14 @@ $STD apk add openssl $STD apk add argon2 msg_ok "Installed Dependencies" -if NEWTOKEN=$(whiptail --passwordbox "Setup your ADMIN-TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3); then +if NEWTOKEN=$(whiptail --passwordbox "Setup your ADMIN_TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3); then if [[ -z "$NEWTOKEN" ]]; then clear - echo -e "⚠ User didn't setup ADMIN-TOKEN, Vaultwarden will not work until setup! \n" - echo -e "► Can be fixed by running the script inside the LXC! \n" - exit + echo -e "⚠ User didn't setup ADMIN_TOKEN, admin panel is disabled! \n" fi else clear - echo -e "⚠ User didn't setup ADMIN-TOKEN, Vaultwarden will not work until setup! \n" - echo -e "► Can be fixed by running the script inside the LXC! \n" - exit + echo -e "⚠ User didn't setup ADMIN_TOKEN, admin panel is disabled! \n" fi msg_info "Installing Alpine-Vaultwarden"