Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

now with just 2 files and no old stuff from month ago #1314

Merged
merged 6 commits into from
Apr 10, 2023
Merged

now with just 2 files and no old stuff from month ago #1314

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
986ee9a
now with just 2 files and no old stuff from month ago
nicedevil007 Apr 9, 2023
9a05da0
where did that number come from o_O
nicedevil007 Apr 9, 2023
da22fd4
removed Admintoken on INSTALL
nicedevil007 Apr 9, 2023
1803ef9
1 line too much :D
nicedevil007 Apr 9, 2023
8df374d
much cleaner
nicedevil007 Apr 9, 2023
af7b8e6
sed syntax
nicedevil007 Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions ct/alpine-vaultwarden.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function update_script() {
CHOICE=$(
whiptail --title "SUPPORT" --menu "Select option" 11 58 2 \
"1" "Update Vaultwarden" \
"2" "Show Admin Token" 3>&2 2>&1 1>&3
"2" "Reset ADMIN_TOKEN" 3>&2 2>&1 1>&3
)
exit_status=$?
if [ $exit_status == 1 ]; then
Expand All @@ -73,7 +73,22 @@ function update_script() {
exit
;;
2)
whiptail --title "ADMIN TOKEN" --msgbox "$(cat /etc/conf.d/vaultwarden | grep ADMIN_TOKEN | awk '{print substr($2, 13) }')" 7 68
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
nicedevil007 marked this conversation as resolved.
Show resolved Hide resolved
sed -i '/admin_token/d' /var/lib/vaultwarden/config.json
sed -i "2i\\ \"admin_token\": \"$ADMINTOKEN\"" /var/lib/vaultwarden/config.json
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
rc-service vaultwarden restart
clear
exit
;;
Expand Down
15 changes: 14 additions & 1 deletion install/alpine-vaultwarden-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,28 @@ $STD apk add openssl
$STD apk add openssh
$STD apk add nano
$STD apk add mc
$STD apk add argon2
msg_ok "Installed Dependencies"

msg_info "Installing Alpine-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
nicedevil007 marked this conversation as resolved.
Show resolved Hide resolved
export DATA_FOLDER=/var/lib/vaultwarden
export WEB_VAULT_FOLDER=/var/lib/vaultwarden/web-vault
export WEB_VAULT_ENABLED=true
export ADMIN_TOKEN=$(openssl rand -base64 48)
export ADMIN_TOKEN='$ADMINTOKEN'
export ROCKET_ADDRESS=0.0.0.0
EOF
$STD rc-service vaultwarden start
Expand Down