From 237517e986231e950d149feb83e54022615c935e Mon Sep 17 00:00:00 2001 From: pshankinclarke Date: Mon, 1 Dec 2025 13:36:08 -0800 Subject: [PATCH] fix urls, simplify auth --- ct/valkey.sh | 2 +- install/valkey-install.sh | 2 +- misc/build.func | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ct/valkey.sh b/ct/valkey.sh index 99825e1df..5c766cc58 100644 --- a/ct/valkey.sh +++ b/ct/valkey.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -fsSL https://raw.githubusercontent.com/pshankinclarke/ProxmoxVED/refs/heads/valkey-bind-fix/misc/build.func) +source <(curl -fsSL https://raw.githubusercontent.com/pshankinclarke/ProxmoxVED/refs/heads/valkey-auth/misc/build.func) # Copyright (c) 2021-2025 community-scripts ORG # Author: pshankinclarke (lazarillo) # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE diff --git a/install/valkey-install.sh b/install/valkey-install.sh index 9ae758351..a7d275b00 100644 --- a/install/valkey-install.sh +++ b/install/valkey-install.sh @@ -18,7 +18,7 @@ $STD apt update $STD apt install -y valkey openssl sed -i 's/^bind .*/bind 0.0.0.0/' /etc/valkey/valkey.conf PASS="$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c32)" -sed -ri "s|(# *)?requirepass .*|requirepass $PASS|" /etc/valkey/valkey.conf +echo "requirepass $PASS" >> /etc/valkey/valkey.conf systemctl enable -q --now valkey-server systemctl restart valkey-server msg_ok "Installed Valkey" diff --git a/misc/build.func b/misc/build.func index 2ef7806cc..25a6e2d18 100644 --- a/misc/build.func +++ b/misc/build.func @@ -2825,7 +2825,7 @@ EOF' set +Eeuo pipefail # Disable ALL error handling temporarily trap - ERR # Remove ERR trap completely - lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/pshankinclarke/ProxmoxVED/refs/heads/valkey-bind-fix/install/${var_install}.sh)" + lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/pshankinclarke/ProxmoxVED/refs/heads/valkey-auth/install/${var_install}.sh)" local lxc_exit=$? set -Eeuo pipefail # Re-enable error handling @@ -2909,7 +2909,7 @@ EOF' if [[ "${DEV_MODE_MOTD:-false}" == "true" ]]; then echo -e "${TAB}${HOLD}${DGN}Setting up MOTD and SSH for debugging...${CL}" if pct exec "$CTID" -- bash -c " - source <(curl -fsSL https://raw.githubusercontent.com/pshankinclarke/ProxmoxVED/refs/heads/valkey-bind-fix/misc/install.func) + source <(curl -fsSL https://raw.githubusercontent.com/pshankinclarke/ProxmoxVED/refs/heads/valkey-auth/misc/install.func) declare -f motd_ssh >/dev/null 2>&1 && motd_ssh || true " >/dev/null 2>&1; then local ct_ip=$(pct exec "$CTID" ip a s dev eth0 2>/dev/null | awk '/inet / {print $2}' | cut -d/ -f1)