Merge branch 'main-upstream'

2024-07-21 15:58:56 +10:00
parent 466f994bb3 6c155c7463
commit 2af0be0e0f
6 changed files with 18 additions and 10 deletions
@@ -128,6 +128,9 @@ function update_script() {
      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)
      sed -i "s|ADMIN_TOKEN=.*|ADMIN_TOKEN='${TOKEN}'|" /opt/vaultwarden/.env
+      if [[ -f /opt/vaultwarden/data/config.json ]]; then
+        sed -i "s|\"admin_token\":.*|\"admin_token\": \"${TOKEN}\"|" /opt/vaultwarden/data/config.json
+      fi
      systemctl restart vaultwarden
    fi
    exit