positioning was wrong

pull/1312/head
nicedevil007 2 years ago
parent 46407df46e
commit f452f339f4
  1. 14
      install/alpine-vaultwarden-install.sh

@ -25,13 +25,6 @@ ADMINTOKEN=''
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 if [[ ! -z "$NEWTOKEN" ]]; then
ADMINTOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -e -id -k 19456 -t 2 -p 1) ADMINTOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -e -id -k 19456 -t 2 -p 1)
cat <<EOF >/etc/conf.d/vaultwarden
export DATA_FOLDER=/var/lib/vaultwarden
export WEB_VAULT_FOLDER=/var/lib/vaultwarden/web-vault
export WEB_VAULT_ENABLED=true
export ADMIN_TOKEN='$ADMINTOKEN'
export ROCKET_ADDRESS=0.0.0.0
EOF
else else
clear clear
echo -e "⚠ User didn't setup ADMIN_TOKEN, admin panel is disabled! \n" echo -e "⚠ User didn't setup ADMIN_TOKEN, admin panel is disabled! \n"
@ -40,6 +33,13 @@ else
clear clear
echo -e "⚠ User didn't setup ADMIN_TOKEN, admin panel is disabled! \n" echo -e "⚠ User didn't setup ADMIN_TOKEN, admin panel is disabled! \n"
fi fi
cat <<EOF >/etc/conf.d/vaultwarden
export DATA_FOLDER=/var/lib/vaultwarden
export WEB_VAULT_FOLDER=/var/lib/vaultwarden/web-vault
export WEB_VAULT_ENABLED=true
export ADMIN_TOKEN='$ADMINTOKEN'
export ROCKET_ADDRESS=0.0.0.0
EOF
$STD rc-service vaultwarden start $STD rc-service vaultwarden start
$STD rc-update add vaultwarden default $STD rc-update add vaultwarden default
msg_ok "Installed Alpine-Vaultwarden" msg_ok "Installed Alpine-Vaultwarden"

Loading…
Cancel
Save