From f7ab4fda4a2d6df3c7fd18fb7d9c216da1c67b8d Mon Sep 17 00:00:00 2001 From: nicedevil007 <17103076+nicedevil007@users.noreply.github.com> Date: Sun, 9 Apr 2023 16:57:52 +0200 Subject: [PATCH] if not recognized --- ct/alpine-vaultwarden.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ct/alpine-vaultwarden.sh b/ct/alpine-vaultwarden.sh index 299197f6..f30e6b39 100644 --- a/ct/alpine-vaultwarden.sh +++ b/ct/alpine-vaultwarden.sh @@ -74,10 +74,11 @@ function update_script() { ;; 2) NEWTOKEN=$(whiptail --passwordbox "Setup your ADMIN-TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3) - if [[ ! -z "$NEWTOKEN" ]]; then - ADMINTOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -e -id -k 19456 -t 2 -p 1) - else - exit-script + 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 + sed -i '/admin_token/d' /var/lib/vaultwarden/config.json + sed -i "2i\\ \"admin_token\": \"$ADMINTOKEN\"" /var/lib/vaultwarden/config.json fi cat </etc/conf.d/vaultwarden export DATA_FOLDER=/var/lib/vaultwarden @@ -86,10 +87,6 @@ export WEB_VAULT_ENABLED=true export ADMIN_TOKEN='$ADMINTOKEN' export ROCKET_ADDRESS=0.0.0.0 EOF - if [[ -f /var/lib/vaultwarden/config.json ]]; then - sed -i '/admin_token/d' /var/lib/vaultwarden/config.json - sed -i "2i\\ \"admin_token\": \"$ADMINTOKEN\"" /var/lib/vaultwarden/config.json - fi rc-service vaultwarden restart clear exit