nick
/
Proxmox_Scripts
mirror of https://github.com/tteck/Proxmox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed Admintoken on INSTALL 

also fixed the missing "," after the ADMINTOKEN line

added a check if argon2 is installed or not during update
This commit is contained in:
nicedevil007 2023-04-09 21:49:22 +02:00
parent 9a05da074f
commit da22fd4115
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ct/alpine-vaultwarden.sh
View File

@ -55,6 +55,9 @@ function update_script() {
if ! apk -e info newt >/dev/null 2>&1; then if ! apk -e info newt >/dev/null 2>&1; then
apk add -q newt apk add -q newt
fi fi
if ! apk -e info argon2 >/dev/null 2>&1; then
apk add -q argon2
fi
while true; do while true; do
CHOICE=$( CHOICE=$(
whiptail --title "SUPPORT" --menu "Select option" 11 58 2 \ whiptail --title "SUPPORT" --menu "Select option" 11 58 2 \
@ -78,7 +81,7 @@ function update_script() {
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)
if [[ -f /var/lib/vaultwarden/config.json ]]; then if [[ -f /var/lib/vaultwarden/config.json ]]; then
sed -i '/admin_token/d' /var/lib/vaultwarden/config.json sed -i '/admin_token/d' /var/lib/vaultwarden/config.json
sed -i "2i\\ \"admin_token\": \"$ADMINTOKEN\"" /var/lib/vaultwarden/config.json sed -i "2i\\ \"admin_token\": \"$ADMINTOKEN\"," /var/lib/vaultwarden/config.json
fi fi
fi fi
cat <<EOF >/etc/conf.d/vaultwarden cat <<EOF >/etc/conf.d/vaultwarden

15
install/alpine-vaultwarden-install.sh
View File

@ -25,23 +25,10 @@ msg_ok "Installed Dependencies"
msg_info "Installing Alpine-Vaultwarden" msg_info "Installing Alpine-Vaultwarden"
$STD apk add vaultwarden $STD apk add vaultwarden
ADMINTOKEN=''
if NEWTOKEN=$(whiptail --passwordbox "Setup your ADMIN_TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3); then
if [[ ! -z "$NEWTOKEN" ]]; then
ADMINTOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -e -id -k 19456 -t 2 -p 1)
else
clear
echo -e "⚠ User didn't setup ADMIN_TOKEN, admin panel is disabled! \n"
fi
else
clear
echo -e "⚠ User didn't setup ADMIN_TOKEN, admin panel is disabled! \n"
fi
cat <<EOF >/etc/conf.d/vaultwarden
export DATA_FOLDER=/var/lib/vaultwarden export DATA_FOLDER=/var/lib/vaultwarden
export WEB_VAULT_FOLDER=/var/lib/vaultwarden/web-vault export WEB_VAULT_FOLDER=/var/lib/vaultwarden/web-vault
export WEB_VAULT_ENABLED=true export WEB_VAULT_ENABLED=true
export ADMIN_TOKEN='$ADMINTOKEN' export ADMIN_TOKEN=''
export ROCKET_ADDRESS=0.0.0.0 export ROCKET_ADDRESS=0.0.0.0
EOF EOF
$STD rc-service vaultwarden start $STD rc-service vaultwarden start