postgresql: default the version prompt and match Alpine's packages

An empty answer, or no TTY, ended the install with 64. The prompt now defaults to 17 and takes var_postgresql_version; the Alpine list is 16/17/18, which is what 3.24 ships.
2026-10-23 11:45:03 +00:00 · 2026-10-23 11:39:02 +02:00
3 changed files with 13 additions and 10 deletions
@@ -85,10 +85,8 @@ function update_script() {
  rm -Rf /etc/apt/sources.list.d/zabbix.list
  cd /tmp

-  ZABBIX_REPO_DIR="debian"
-  [[ "$ZABBIX_VERSION" == "7.0" && "$(arch_resolve)" == "arm64" ]] && ZABBIX_REPO_DIR="debian-arm64"
  if [[ "$ZABBIX_VERSION" == "7.0" ]]; then
-    ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/${ZABBIX_REPO_DIR}/pool/main/z/zabbix-release/zabbix-release_latest_${ZABBIX_VERSION}+debian13_all.deb"
+    ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/debian/pool/main/z/zabbix-release/zabbix-release_latest_${ZABBIX_VERSION}+debian13_all.deb"
    ZABBIX_DEB_FILE="zabbix-release_latest_${ZABBIX_VERSION}+debian13_all.deb"
  else
    ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/release/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian13_all.deb"
@@ -14,9 +14,11 @@ network_check
 update_os

 setup_deb_based() {
-  read -r -p "${TAB3}Enter PostgreSQL version (15/16/17/18): " ver
+  ver="${var_postgresql_version:-}"
+  [[ -n "$ver" ]] || read -r -p "${TAB3}Enter PostgreSQL version (15/16/17/18) [17]: " ver || true
+  ver="${ver:-17}"
  [[ $ver =~ ^(15|16|17|18)$ ]] || {
-    echo "Invalid version"
+    msg_error "Invalid PostgreSQL version: ${ver} (expected 15, 16, 17 or 18)"
    exit 64
  }
  PG_VERSION=$ver setup_postgresql
@@ -136,8 +138,13 @@ EOF
 }

 setup_alpine() {
-  read -r -p "${TAB3}Enter PostgreSQL version (15/16/17): " ver
-  [[ $ver =~ ^(15|16|17)$ ]] || { echo "Invalid version"; exit 64; }
+  ver="${var_postgresql_version:-}"
+  [[ -n "$ver" ]] || read -r -p "${TAB3}Enter PostgreSQL version (16/17/18) [17]: " ver || true
+  ver="${ver:-17}"
+  [[ $ver =~ ^(16|17|18)$ ]] || {
+    msg_error "Invalid PostgreSQL version: ${ver} (expected 16, 17 or 18)"
+    exit 64
+  }

  msg_info "Installing PostgreSQL ${ver}"
  $STD apk add --no-cache postgresql${ver} postgresql${ver}-contrib postgresql${ver}-openrc sudo
@@ -32,10 +32,8 @@ esac
 msg_info "Installing Zabbix $ZABBIX_VERSION"
 cd /tmp

-ZABBIX_REPO_DIR="debian"
-[[ "$ZABBIX_VERSION" == "7.0" && "$(arch_resolve)" == "arm64" ]] && ZABBIX_REPO_DIR="debian-arm64"
 if [[ "$ZABBIX_VERSION" == "7.0" ]]; then
-  ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/${ZABBIX_REPO_DIR}/pool/main/z/zabbix-release/zabbix-release_latest_${ZABBIX_VERSION}+debian13_all.deb"
+  ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/debian/pool/main/z/zabbix-release/zabbix-release_latest_${ZABBIX_VERSION}+debian13_all.deb"
  ZABBIX_DEB_FILE="zabbix-release_latest_${ZABBIX_VERSION}+debian13_all.deb"
 else
  ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/release/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian13_all.deb"