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

Compare commits

base: nick:76479a7733b1e1122835a1b1b0afd05a5204e6b0
Branches Tags
nick:main
nick:gh-pages
..
compare: nick:ab2cd43c159e79145b699e3c0bdda48c45ff776c
Branches Tags
nick:gh-pages
nick:main

No commits in common. "76479a7733b1e1122835a1b1b0afd05a5204e6b0" and "ab2cd43c159e79145b699e3c0bdda48c45ff776c" have entirely different histories.
76479a7733 ... ab2cd43c15

5 changed files with 6 additions and 17 deletions
Show Stats Expand all files Collapse all files

14
ct/alpine-vaultwarden.sh
View File

@ -59,7 +59,7 @@ function update_script() {
CHOICE=$( CHOICE=$(
whiptail --title "SUPPORT" --menu "Select option" 11 58 2 \ whiptail --title "SUPPORT" --menu "Select option" 11 58 2 \
"1" "Update Vaultwarden" \ "1" "Update Vaultwarden" \
"2" "Reset ADMIN_TOKEN" 3>&2 2>&1 1>&3 "2" "Show Admin Token" 3>&2 2>&1 1>&3
) )
exit_status=$? exit_status=$?
if [ $exit_status == 1 ]; then if [ $exit_status == 1 ]; then
@ -73,17 +73,7 @@ function update_script() {
exit exit
;; ;;
2) 2)
if NEWTOKEN=$(whiptail --passwordbox "Setup your ADMIN_TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3); then whiptail --title "ADMIN TOKEN" --msgbox "$(cat /etc/conf.d/vaultwarden | grep ADMIN_TOKEN | awk '{print substr($2, 13) }')" 7 68
if [[ -z "$NEWTOKEN" ]]; then exit-script; fi
if ! command -v argon2 >/dev/null 2>&1; then apk add argon2 &>/dev/null; fi
TOKEN=$(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 "s|export ADMIN_TOKEN=.*|export ADMIN_TOKEN='${TOKEN}'|" /etc/conf.d/vaultwarden
else
sed -i "s|\"admin_token\": .*|\"admin_token\": \"${TOKEN}\",|" /var/lib/vaultwarden/config.json
fi
rc-service vaultwarden restart -q
fi
clear clear
exit exit
;; ;;

2
ct/cronicle.sh
View File

@ -106,4 +106,4 @@ description
msg_ok "Completed Successfully!\n" msg_ok "Completed Successfully!\n"
echo -e "${APP} Primary should be reachable by going to the following URL. echo -e "${APP} Primary should be reachable by going to the following URL.
${BL}http://${IP}:3012${CL} \n" ${BL}http://${IP}:3012${CL} admin|admin \n"

2
ct/vaultwarden.sh
View File

@ -125,7 +125,7 @@ function update_script() {
if [[ -z "$NEWTOKEN" ]]; then exit; fi if [[ -z "$NEWTOKEN" ]]; then exit; fi
if ! command -v argon2 >/dev/null 2>&1; then apt-get install -y argon2 &>/dev/null; fi if ! command -v argon2 >/dev/null 2>&1; then apt-get install -y argon2 &>/dev/null; fi
TOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -t 2 -m 16 -p 4 -l 64 -e) TOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -t 2 -m 16 -p 4 -l 64 -e)
sed -i "s|ADMIN_TOKEN=.*|ADMIN_TOKEN='${TOKEN}'|" /opt/vaultwarden/.env sed -i "s|ADMIN_TOKEN='.*'|ADMIN_TOKEN='${TOKEN}'|" /opt/vaultwarden/.env
systemctl restart vaultwarden systemctl restart vaultwarden
fi fi
exit exit

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

@ -20,7 +20,6 @@ $STD apk add openssl
$STD apk add openssh $STD apk add openssh
$STD apk add nano $STD apk add nano
$STD apk add mc $STD apk add mc
$STD apk add argon2
msg_ok "Installed Dependencies" msg_ok "Installed Dependencies"
msg_info "Installing Alpine-Vaultwarden" msg_info "Installing Alpine-Vaultwarden"
@ -29,7 +28,7 @@ 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='' export ADMIN_TOKEN=$(openssl rand -base64 48)
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

2
install/cronicle-install.sh
View File

@ -40,7 +40,7 @@ $STD tar zxvf <(curl -fsSL https://github.com/jhuckaby/Cronicle/archive/${LATEST
$STD npm install $STD npm install
$STD node bin/build.js dist $STD node bin/build.js dist
sed -i "s/localhost:3012/${IP}:3012/g" /opt/cronicle/conf/config.json sed -i "s/localhost:3012/${IP}:3012/g" /opt/cronicle/conf/config.json
$STD /opt/cronicle/bin/control.sh setup if [[ $SERV == "y" ]]; then $STD /opt/cronicle/bin/control.sh setup; fi
$STD /opt/cronicle/bin/control.sh start $STD /opt/cronicle/bin/control.sh start
$STD cp /opt/cronicle/bin/cronicled.init /etc/init.d/cronicled $STD cp /opt/cronicle/bin/cronicled.init /etc/init.d/cronicled
chmod 775 /etc/init.d/cronicled chmod 775 /etc/init.d/cronicled