Update CHANGELOG.md (#10763)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -10,8 +10,65 @@
 > [!CAUTION]
 Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit the project's popularity for potentially malicious purposes.
 
+## 2026-01-13
+
+## 2026-01-12
+
+### 🆕 New Scripts
+
+  - Jellystat ([#10628](https://github.com/community-scripts/ProxmoxVE/pull/10628))
+
+### 🚀 Updated Scripts
+
+  - #### 🐞 Bug Fixes
+
+    - InfluxSB: fix If / fi [@chrnie](https://github.com/chrnie) ([#10753](https://github.com/community-scripts/ProxmoxVE/pull/10753))
+    - Cockpit: Downgrade to Debian 12 Bookworm (45Drives Issue) [@MickLesk](https://github.com/MickLesk) ([#10717](https://github.com/community-scripts/ProxmoxVE/pull/10717))
+
+  - #### ✨ New Features
+
+    - InfluxDB: add setup for influxdb v3 [@victorlap](https://github.com/victorlap) ([#10736](https://github.com/community-scripts/ProxmoxVE/pull/10736))
+    - Apache Guacamole: add schema upgrades and extension updates [@MickLesk](https://github.com/MickLesk) ([#10746](https://github.com/community-scripts/ProxmoxVE/pull/10746))
+    - Apache Tomcat: update support and refactor install script + debian 13 [@MickLesk](https://github.com/MickLesk) ([#10739](https://github.com/community-scripts/ProxmoxVE/pull/10739))
+    - Apache Guacamole: Function Bump + update_script [@MickLesk](https://github.com/MickLesk) ([#10728](https://github.com/community-scripts/ProxmoxVE/pull/10728))
+    - Apache CouchDB: bump to debian 13 and add update support [@MickLesk](https://github.com/MickLesk) ([#10721](https://github.com/community-scripts/ProxmoxVE/pull/10721))
+    - Apache Cassandra: bump to debian 13 and add update support [@MickLesk](https://github.com/MickLesk) ([#10720](https://github.com/community-scripts/ProxmoxVE/pull/10720))
+
+  - #### 🔧 Refactor
+
+    - Refactor: Booklore [@MickLesk](https://github.com/MickLesk) ([#10742](https://github.com/community-scripts/ProxmoxVE/pull/10742))
+    - Bump Argus to Debian 13 [@MickLesk](https://github.com/MickLesk) ([#10718](https://github.com/community-scripts/ProxmoxVE/pull/10718))
+    - Refactor Docker/Dockge & Bump to Debian 13 [@MickLesk](https://github.com/MickLesk) ([#10719](https://github.com/community-scripts/ProxmoxVE/pull/10719))
+
+### 💾 Core
+
+  - #### 🐞 Bug Fixes
+
+    - core: remove duplicated pve_version in advanced installs [@MickLesk](https://github.com/MickLesk) ([#10743](https://github.com/community-scripts/ProxmoxVE/pull/10743))
+
+  - #### ✨ New Features
+
+    - core: add storage validation & fix GB/MB display [@MickLesk](https://github.com/MickLesk) ([#10745](https://github.com/community-scripts/ProxmoxVE/pull/10745))
+    - core: validate container ID before pct create to prevent failures [@MickLesk](https://github.com/MickLesk) ([#10729](https://github.com/community-scripts/ProxmoxVE/pull/10729))
+
+  - #### 🔧 Refactor
+
+    - Enforce non-interactive apt mode in DB setup scripts [@MickLesk](https://github.com/MickLesk) ([#10714](https://github.com/community-scripts/ProxmoxVE/pull/10714))
+
 ## 2026-01-11
 
+### 🚀 Updated Scripts
+
+  - #### 🐞 Bug Fixes
+
+    - Fix Invoice Ninja Error 500 by restoring file ownership after artisan commands [@Copilot](https://github.com/Copilot) ([#10709](https://github.com/community-scripts/ProxmoxVE/pull/10709))
+
+  - #### 🔧 Refactor
+
+    - Refactor: Infisical [@tremor021](https://github.com/tremor021) ([#10693](https://github.com/community-scripts/ProxmoxVE/pull/10693))
+    - Refactor: HortusFox [@tremor021](https://github.com/tremor021) ([#10697](https://github.com/community-scripts/ProxmoxVE/pull/10697))
+    - Refactor: Homer [@tremor021](https://github.com/tremor021) ([#10698](https://github.com/community-scripts/ProxmoxVE/pull/10698))
+
 ## 2026-01-10
 
 ### 🚀 Updated Scripts

ct/apache-cassandra.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-4}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -20,15 +20,19 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-    if [[ ! -f /etc/systemd/system/cassandra.service ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_error "Currently we don't provide an update function for this ${APP}."
+  header_info
+  check_container_storage
+  check_container_resources
+  if [[ ! -f /etc/init.d/cassandra ]]; then
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+  msg_info "Updating Apache Cassandra"
+  $STD apt update
+  $STD apt install -y --only-upgrade cassandra cassandra-tools
+  msg_ok "Updated Apache Cassandra"
+  msg_ok "Updated successfully!"
+  exit
 }
 
 start

ct/apache-couchdb.sh

@@ -5,13 +5,13 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://couchdb.apache.org/
 
-APP="Apache-CouchDB"
+APP="Apache CouchDB"
 var_tags="${var_tags:-database}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-4096}"
 var_disk="${var_disk:-10}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -20,15 +20,19 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-    if [[ ! -f /etc/systemd/system/couchdb.service ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_error "Currently we don't provide an update function for this ${APP}."
+  header_info
+  check_container_storage
+  check_container_resources
+  if [[ ! -f /usr/lib/systemd/system/couchdb.service ]]; then
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+  msg_info "Updating Apache CouchDB"
+  $STD apt-get update
+  $STD apt-get install -y --only-upgrade couchdb
+  msg_ok "Updated Apache CouchDB"
+  msg_ok "Updated successfully!"
+  exit
 }
 
 start

ct/apache-guacamole.sh

@@ -27,8 +27,196 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
-  msg_error "Currently we don't provide an update function for this ${APP}."
+
+  # Fetch latest versions
+  LATEST_TOMCAT=$(curl -fsSL https://dlcdn.apache.org/tomcat/tomcat-9/ | grep -oP '(?<=href=")v[^"/]+(?=/")' | sed 's/^v//' | sort -V | tail -n1)
+  LATEST_SERVER=$(curl -fsSL https://api.github.com/repos/apache/guacamole-server/tags | jq -r '.[].name' | grep -v -- '-RC' | head -n 1)
+  LATEST_CLIENT=$(curl -fsSL https://api.github.com/repos/apache/guacamole-client/tags | jq -r '.[].name' | grep -v -- '-RC' | head -n 1)
+  LATEST_MYSQL_CONNECTOR=$(curl -fsSL "https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/maven-metadata.xml" | grep -oP '<latest>\K[^<]+')
+
+  # Read current versions from ~/.guacamole_*
+  CURRENT_TOMCAT=$(cat ~/.guacamole_tomcat 2>/dev/null || echo "unknown")
+  CURRENT_SERVER=$(cat ~/.guacamole_server 2>/dev/null || echo "unknown")
+  CURRENT_CLIENT=$(cat ~/.guacamole_client 2>/dev/null || echo "unknown")
+  CURRENT_MYSQL_CONNECTOR=$(cat ~/.guacamole_mysql_connector 2>/dev/null || echo "unknown")
+
+  UPDATE_NEEDED=false
+  [[ "$CURRENT_TOMCAT" != "$LATEST_TOMCAT" ]] && UPDATE_NEEDED=true
+  [[ "$CURRENT_SERVER" != "$LATEST_SERVER" ]] && UPDATE_NEEDED=true
+  [[ "$CURRENT_CLIENT" != "$LATEST_CLIENT" ]] && UPDATE_NEEDED=true
+  [[ "$CURRENT_MYSQL_CONNECTOR" != "$LATEST_MYSQL_CONNECTOR" ]] && UPDATE_NEEDED=true
+
+  if [[ "$UPDATE_NEEDED" == "false" ]]; then
+    msg_ok "All components are up to date"
+    exit
+  fi
+
+  JAVA_VERSION="11" setup_java
+
+  msg_info "Stopping Services"
+  systemctl stop guacd tomcat
+  msg_ok "Stopped Services"
+
+  # Update Tomcat
+  if [[ "$CURRENT_TOMCAT" != "$LATEST_TOMCAT" ]]; then
+    msg_info "Updating Tomcat (${CURRENT_TOMCAT} → ${LATEST_TOMCAT})"
+    cp -a /opt/apache-guacamole/tomcat9/conf /tmp/tomcat-conf-backup
+    curl -fsSL "https://dlcdn.apache.org/tomcat/tomcat-9/v${LATEST_TOMCAT}/bin/apache-tomcat-${LATEST_TOMCAT}.tar.gz" | tar -xz -C /opt/apache-guacamole/tomcat9 --strip-components=1 --exclude='conf/*'
+    cp -a /tmp/tomcat-conf-backup/* /opt/apache-guacamole/tomcat9/conf/
+    rm -rf /tmp/tomcat-conf-backup
+    chown -R tomcat: /opt/apache-guacamole/tomcat9
+    echo "${LATEST_TOMCAT}" >~/.guacamole_tomcat
+    msg_ok "Updated Tomcat"
+  else
+    msg_ok "Tomcat already up to date (${CURRENT_TOMCAT})"
+  fi
+
+  # Update Guacamole Server
+  if [[ "$CURRENT_SERVER" != "$LATEST_SERVER" ]]; then
+    msg_info "Updating Guacamole Server (${CURRENT_SERVER} → ${LATEST_SERVER})"
+    rm -rf /opt/apache-guacamole/server/*
+    curl -fsSL "https://api.github.com/repos/apache/guacamole-server/tarball/refs/tags/${LATEST_SERVER}" | tar -xz --strip-components=1 -C /opt/apache-guacamole/server
+    cd /opt/apache-guacamole/server
+    export CPPFLAGS="-Wno-error=deprecated-declarations"
+    $STD autoreconf -fi
+    $STD ./configure --with-init-dir=/etc/init.d --enable-allow-freerdp-snapshots
+    $STD make
+    $STD make install
+    $STD ldconfig
+    echo "${LATEST_SERVER}" >~/.guacamole_server
+    msg_ok "Updated Guacamole Server"
+
+    # Auth JDBC follows server version
+    msg_info "Updating Guacamole Auth JDBC"
+    rm -f /etc/guacamole/extensions/guacamole-auth-jdbc-mysql-*.jar
+    curl -fsSL "https://downloads.apache.org/guacamole/${LATEST_SERVER}/binary/guacamole-auth-jdbc-${LATEST_SERVER}.tar.gz" -o "/tmp/guacamole-auth-jdbc.tar.gz"
+    $STD tar -xf /tmp/guacamole-auth-jdbc.tar.gz -C /tmp
+    mv /tmp/guacamole-auth-jdbc-"${LATEST_SERVER}"/mysql/guacamole-auth-jdbc-mysql-"${LATEST_SERVER}".jar /etc/guacamole/extensions/
+    rm -rf /tmp/guacamole-auth-jdbc*
+    echo "${LATEST_SERVER}" >~/.guacamole_auth_jdbc
+    msg_ok "Updated Guacamole Auth JDBC"
+  else
+    msg_ok "Guacamole Server already up to date (${CURRENT_SERVER})"
+  fi
+
+  # Update Guacamole Client
+  if [[ "$CURRENT_CLIENT" != "$LATEST_CLIENT" ]]; then
+    msg_info "Updating Guacamole Client (${CURRENT_CLIENT} → ${LATEST_CLIENT})"
+    curl -fsSL "https://downloads.apache.org/guacamole/${LATEST_CLIENT}/binary/guacamole-${LATEST_CLIENT}.war" -o "/opt/apache-guacamole/tomcat9/webapps/guacamole.war"
+    echo "${LATEST_CLIENT}" >~/.guacamole_client
+    msg_ok "Updated Guacamole Client"
+  else
+    msg_ok "Guacamole Client already up to date (${CURRENT_CLIENT})"
+  fi
+
+  # Update MySQL Connector
+  if [[ "$CURRENT_MYSQL_CONNECTOR" != "$LATEST_MYSQL_CONNECTOR" ]]; then
+    msg_info "Updating MySQL Connector (${CURRENT_MYSQL_CONNECTOR} → ${LATEST_MYSQL_CONNECTOR})"
+    curl -fsSL "https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${LATEST_MYSQL_CONNECTOR}/mysql-connector-j-${LATEST_MYSQL_CONNECTOR}.jar" -o "/etc/guacamole/lib/mysql-connector-j.jar"
+    echo "${LATEST_MYSQL_CONNECTOR}" >~/.guacamole_mysql_connector
+    msg_ok "Updated MySQL Connector"
+  else
+    msg_ok "MySQL Connector already up to date (${CURRENT_MYSQL_CONNECTOR})"
+  fi
+
+  # Apply SQL Schema Upgrades (CRITICAL!)
+  if [[ "$CURRENT_SERVER" != "$LATEST_SERVER" ]]; then
+    msg_info "Applying MySQL Schema Upgrades"
+    cd /tmp/guacamole-auth-jdbc-"${LATEST_SERVER}"/mysql/schema/upgrade/
+    UPGRADE_FILES=($(ls -1 upgrade-pre-*.sql 2>/dev/null | sort -V))
+
+    if [[ ${#UPGRADE_FILES[@]} -gt 0 ]]; then
+      for SQL_FILE in "${UPGRADE_FILES[@]}"; do
+        FILE_VERSION=$(echo ${SQL_FILE} | grep -oP 'upgrade-pre-\K[0-9\.]+(?=\.)')
+        # Apply upgrade if file version is newer than current but older/equal to target
+        if [[ $(echo -e "${FILE_VERSION}\n${CURRENT_SERVER}" | sort -V | head -n1) == "${CURRENT_SERVER}" && "${FILE_VERSION}" != "${CURRENT_SERVER}" ]]; then
+          msg_info "Applying schema patch: ${SQL_FILE}"
+          mysql -u root guacamole_db <"${SQL_FILE}" 2>/dev/null
+          if [[ $? -eq 0 ]]; then
+            msg_ok "Applied ${SQL_FILE}"
+          else
+            msg_warn "Failed to apply ${SQL_FILE} (may already be applied)"
+          fi
+        fi
+      done
+    fi
+    msg_ok "MySQL Schema updated"
+  fi
+
+  # Check and upgrade optional extensions
+  # TOTP Extension
+  if [[ -f /etc/guacamole/extensions/guacamole-auth-totp-*.jar ]]; then
+    msg_info "Updating TOTP Extension"
+    rm -f /etc/guacamole/extensions/guacamole-auth-totp-*.jar
+    curl -fsSL "https://downloads.apache.org/guacamole/${LATEST_SERVER}/binary/guacamole-auth-totp-${LATEST_SERVER}.tar.gz" -o "/tmp/guacamole-auth-totp.tar.gz"
+    $STD tar -xf /tmp/guacamole-auth-totp.tar.gz -C /tmp
+    mv /tmp/guacamole-auth-totp-"${LATEST_SERVER}"/guacamole-auth-totp-"${LATEST_SERVER}".jar /etc/guacamole/extensions/
+    chmod 664 /etc/guacamole/extensions/guacamole-auth-totp-"${LATEST_SERVER}".jar
+    rm -rf /tmp/guacamole-auth-totp*
+    msg_ok "Updated TOTP Extension"
+  fi
+
+  # DUO Extension
+  if [[ -f /etc/guacamole/extensions/guacamole-auth-duo-*.jar ]]; then
+    msg_info "Updating DUO Extension"
+    rm -f /etc/guacamole/extensions/guacamole-auth-duo-*.jar
+    curl -fsSL "https://downloads.apache.org/guacamole/${LATEST_SERVER}/binary/guacamole-auth-duo-${LATEST_SERVER}.tar.gz" -o "/tmp/guacamole-auth-duo.tar.gz"
+    $STD tar -xf /tmp/guacamole-auth-duo.tar.gz -C /tmp
+    mv /tmp/guacamole-auth-duo-"${LATEST_SERVER}"/guacamole-auth-duo-"${LATEST_SERVER}".jar /etc/guacamole/extensions/
+    chmod 664 /etc/guacamole/extensions/guacamole-auth-duo-"${LATEST_SERVER}".jar
+    rm -rf /tmp/guacamole-auth-duo*
+    msg_ok "Updated DUO Extension"
+  fi
+
+  # LDAP Extension
+  if [[ -f /etc/guacamole/extensions/guacamole-auth-ldap-*.jar ]]; then
+    msg_info "Updating LDAP Extension"
+    rm -f /etc/guacamole/extensions/guacamole-auth-ldap-*.jar
+    curl -fsSL "https://downloads.apache.org/guacamole/${LATEST_SERVER}/binary/guacamole-auth-ldap-${LATEST_SERVER}.tar.gz" -o "/tmp/guacamole-auth-ldap.tar.gz"
+    $STD tar -xf /tmp/guacamole-auth-ldap.tar.gz -C /tmp
+    mv /tmp/guacamole-auth-ldap-"${LATEST_SERVER}"/guacamole-auth-ldap-"${LATEST_SERVER}".jar /etc/guacamole/extensions/
+    chmod 664 /etc/guacamole/extensions/guacamole-auth-ldap-"${LATEST_SERVER}".jar
+    rm -rf /tmp/guacamole-auth-ldap*
+    msg_ok "Updated LDAP Extension"
+  fi
+
+  # Quick Connect Extension
+  if [[ -f /etc/guacamole/extensions/guacamole-auth-quickconnect-*.jar ]]; then
+    msg_info "Updating Quick Connect Extension"
+    rm -f /etc/guacamole/extensions/guacamole-auth-quickconnect-*.jar
+    curl -fsSL "https://downloads.apache.org/guacamole/${LATEST_SERVER}/binary/guacamole-auth-quickconnect-${LATEST_SERVER}.tar.gz" -o "/tmp/guacamole-auth-quickconnect.tar.gz"
+    $STD tar -xf /tmp/guacamole-auth-quickconnect.tar.gz -C /tmp
+    mv /tmp/guacamole-auth-quickconnect-"${LATEST_SERVER}"/guacamole-auth-quickconnect-"${LATEST_SERVER}".jar /etc/guacamole/extensions/
+    chmod 664 /etc/guacamole/extensions/guacamole-auth-quickconnect-"${LATEST_SERVER}".jar
+    rm -rf /tmp/guacamole-auth-quickconnect*
+    msg_ok "Updated Quick Connect Extension"
+  fi
+
+  # History Recording Storage Extension
+  if [[ -f /etc/guacamole/extensions/guacamole-history-recording-storage-*.jar ]]; then
+    msg_info "Updating History Recording Storage Extension"
+    rm -f /etc/guacamole/extensions/guacamole-history-recording-storage-*.jar
+    curl -fsSL "https://downloads.apache.org/guacamole/${LATEST_SERVER}/binary/guacamole-history-recording-storage-${LATEST_SERVER}.tar.gz" -o "/tmp/guacamole-history-recording-storage.tar.gz"
+    $STD tar -xf /tmp/guacamole-history-recording-storage.tar.gz -C /tmp
+    mv /tmp/guacamole-history-recording-storage-"${LATEST_SERVER}"/guacamole-history-recording-storage-"${LATEST_SERVER}".jar /etc/guacamole/extensions/
+    chmod 664 /etc/guacamole/extensions/guacamole-history-recording-storage-"${LATEST_SERVER}".jar
+    rm -rf /tmp/guacamole-history-recording-storage*
+    msg_ok "Updated History Recording Storage Extension"
+  fi
+
+  # Reset permissions and prepare for service start
+  msg_info "Resetting permissions"
+  mkdir -p /var/guacamole
+  chown daemon:daemon /var/guacamole
+  mkdir -p /home/daemon/.config/freerdp
+  chown daemon:daemon /home/daemon/.config/freerdp
+  msg_ok "Permissions reset"
+
+  msg_info "Starting Services"
+  systemctl daemon-reload
+  systemctl start tomcat guacd
+  msg_ok "Started Services"
+  msg_ok "Updated successfully!"
   exit
 }
 

ct/apache-tomcat.sh

@@ -11,7 +11,7 @@ var_disk="${var_disk:-5}"
 var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-1024}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -20,15 +20,79 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-    if ! ls -d /opt/tomcat-* >/dev/null 2>&1; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_error "Currently we don't provide an update function for this ${APP}."
+  header_info
+  check_container_storage
+  check_container_resources
+
+  TOMCAT_DIR=$(ls -d /opt/tomcat-* 2>/dev/null | head -n1)
+  if [[ -z "$TOMCAT_DIR" || ! -d "$TOMCAT_DIR" ]]; then
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+
+  # Detect major version and current version from install path (e.g., /opt/tomcat-11 -> 11)
+  TOMCAT_MAJOR=$(basename "$TOMCAT_DIR" | grep -oP 'tomcat-\K[0-9]+')
+  if [[ -z "$TOMCAT_MAJOR" ]]; then
+    msg_error "Cannot determine Tomcat major version from path: $TOMCAT_DIR"
+    exit
+  fi
+  CURRENT_VERSION=$(grep -oP 'Apache Tomcat Version \K[0-9.]+' "$TOMCAT_DIR/RELEASE-NOTES" 2>/dev/null || echo "unknown")
+  LATEST_VERSION=$(curl -fsSL "https://dlcdn.apache.org/tomcat/tomcat-${TOMCAT_MAJOR}/" | grep -oP 'v[0-9]+\.[0-9]+\.[0-9]+(-M[0-9]+)?/' | sort -V | tail -n1 | sed 's/\/$//; s/v//')
+
+  if [[ -z "$LATEST_VERSION" ]]; then
+    msg_error "Failed to fetch latest version for Tomcat ${TOMCAT_MAJOR}"
+    exit
+  fi
+
+  if [[ "$CURRENT_VERSION" == "$LATEST_VERSION" ]]; then
+    msg_ok "${APP} ${CURRENT_VERSION} is already up to date"
+    exit
+  fi
+
+  msg_info "Stopping Tomcat service"
+  systemctl stop tomcat
+  msg_ok "Stopped Tomcat service"
+
+  msg_info "Backing up configuration and applications"
+  BACKUP_DIR="/tmp/tomcat-backup-$$"
+  mkdir -p "$BACKUP_DIR"
+  cp -a "$TOMCAT_DIR/conf" "$BACKUP_DIR/conf"
+  cp -a "$TOMCAT_DIR/webapps" "$BACKUP_DIR/webapps"
+  [[ -d "$TOMCAT_DIR/lib" ]] && cp -a "$TOMCAT_DIR/lib" "$BACKUP_DIR/lib"
+  msg_ok "Backed up configuration and applications"
+
+  msg_info "Downloading Tomcat ${LATEST_VERSION}"
+  TOMCAT_URL="https://dlcdn.apache.org/tomcat/tomcat-${TOMCAT_MAJOR}/v${LATEST_VERSION}/bin/apache-tomcat-${LATEST_VERSION}.tar.gz"
+  curl -fsSL "$TOMCAT_URL" -o /tmp/tomcat-update.tar.gz
+  msg_ok "Downloaded Tomcat ${LATEST_VERSION}"
+
+  msg_info "Installing update"
+  rm -rf "${TOMCAT_DIR:?}"/*
+  tar --strip-components=1 -xzf /tmp/tomcat-update.tar.gz -C "$TOMCAT_DIR"
+  rm -f /tmp/tomcat-update.tar.gz
+  msg_ok "Installed update"
+
+  msg_info "Restoring configuration and applications"
+  cp -a "$BACKUP_DIR/conf"/* "$TOMCAT_DIR/conf/"
+  cp -a "$BACKUP_DIR/webapps"/* "$TOMCAT_DIR/webapps/" 2>/dev/null || true
+  if [[ -d "$BACKUP_DIR/lib" ]]; then
+    for jar in "$BACKUP_DIR/lib"/*.jar; do
+      [[ -f "$jar" ]] || continue
+      jar_name=$(basename "$jar")
+      if [[ ! -f "$TOMCAT_DIR/lib/$jar_name" ]]; then
+        cp "$jar" "$TOMCAT_DIR/lib/"
+      fi
+    done
+  fi
+  rm -rf "$BACKUP_DIR"
+  chown -R root:root "$TOMCAT_DIR"
+  msg_ok "Restored configuration and applications"
+
+  msg_info "Starting Tomcat service"
+  systemctl start tomcat
+  msg_ok "Started Tomcat service"
+  msg_ok "Updated successfully!"
+  exit
 }
 
 start

ct/argus.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-512}"
 var_disk="${var_disk:-3}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"

ct/booklore.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-3}"
 var_ram="${var_ram:-3072}"
 var_disk="${var_disk:-7}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -28,15 +28,29 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
+
   if check_for_gh_release "booklore" "booklore-app/BookLore"; then
+    JAVA_VERSION="21" setup_java
+    NODE_VERSION="22" setup_nodejs
+    setup_mariadb
+    setup_yq
+
     msg_info "Stopping Service"
     systemctl stop booklore
-    msg_info "Stopped Service"
+    msg_ok "Stopped Service"
 
-    msg_info "backup old install"
+    if grep -qE "^BOOKLORE_(DATA_PATH|BOOKDROP_PATH|BOOKS_PATH|PORT)=" /opt/booklore_storage/.env 2>/dev/null; then
+      msg_info "Migrating old environment variables"
+      sed -i 's/^BOOKLORE_DATA_PATH=/APP_PATH_CONFIG=/g' /opt/booklore_storage/.env
+      sed -i 's/^BOOKLORE_BOOKDROP_PATH=/APP_BOOKDROP_FOLDER=/g' /opt/booklore_storage/.env
+      sed -i '/^BOOKLORE_BOOKS_PATH=/d' /opt/booklore_storage/.env
+      sed -i '/^BOOKLORE_PORT=/d' /opt/booklore_storage/.env
+      msg_ok "Migrated old environment variables"
+    fi
+
+    msg_info "Backing up old installation"
     mv /opt/booklore /opt/booklore_bak
-    msg_ok "backup done"
+    msg_ok "Backed up old installation"
 
     fetch_and_deploy_gh_release "booklore" "booklore-app/BookLore" "tarball"
 
@@ -46,12 +60,9 @@ function update_script() {
     $STD npm run build --configuration=production
     msg_ok "Built Frontend"
 
-    JAVA_VERSION="21" setup_java
-    setup_yq
-
     msg_info "Building Backend"
     cd /opt/booklore/booklore-api
-    APP_VERSION=$(curl -fsSL https://api.github.com/repos/booklore-app/BookLore/releases/latest | yq '.tag_name' | sed 's/^v//')
+    APP_VERSION=$(get_latest_github_release "booklore-app/BookLore")
     yq eval ".app.version = \"${APP_VERSION}\"" -i src/main/resources/application.yaml
     $STD ./gradlew clean build --no-daemon
     mkdir -p /opt/booklore/dist

ct/cockpit.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-1024}"
 var_disk="${var_disk:-4}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
+var_version="${var_version:-12}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"

ct/docker.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-4}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -24,33 +24,20 @@ function update_script() {
   check_container_storage
   check_container_resources
 
-  get_latest_release() {
-    curl -fsSL https://api.github.com/repos/"$1"/releases/latest | grep '"tag_name":' | cut -d'"' -f4
-  }
-
   msg_info "Updating base system"
-  $STD apt-get update
-  $STD apt-get -y upgrade
+  $STD apt update
+  $STD apt upgrade -y 
   msg_ok "Base system updated"
 
   msg_info "Updating Docker Engine"
-  $STD apt-get install --only-upgrade -y docker-ce docker-ce-cli containerd.io
+  $STD apt install --only-upgrade -y docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-buildx-plugin
   msg_ok "Docker Engine updated"
 
-  if [[ -f /usr/local/lib/docker/cli-plugins/docker-compose ]]; then
-    COMPOSE_BIN="/usr/local/lib/docker/cli-plugins/docker-compose"
-    COMPOSE_NEW_VERSION=$(get_latest_release "docker/compose")
-    msg_info "Updating Docker Compose to $COMPOSE_NEW_VERSION"
-    curl -fsSL "https://github.com/docker/compose/releases/download/${COMPOSE_NEW_VERSION}/docker-compose-$(uname -s)-$(uname -m)" \
-      -o "$COMPOSE_BIN"
-    chmod +x "$COMPOSE_BIN"
-    msg_ok "Docker Compose updated"
-  fi
-
   if docker ps -a --format '{{.Image}}' | grep -q '^portainer/portainer-ce:latest$'; then
     msg_info "Updating Portainer"
     $STD docker pull portainer/portainer-ce:latest
-    $STD docker stop portainer && docker rm portainer
+    $STD docker stop portainer
+    $STD docker rm portainer
     $STD docker volume create portainer_data >/dev/null 2>&1
     $STD docker run -d \
       -p 8000:8000 \
@@ -66,7 +53,8 @@ function update_script() {
   if docker ps -a --format '{{.Names}}' | grep -q '^portainer_agent$'; then
     msg_info "Updating Portainer Agent"
     $STD docker pull portainer/agent:latest
-    $STD docker stop portainer_agent && docker rm portainer_agent
+    $STD docker stop portainer_agent
+    $STD docker rm portainer_agent
     $STD docker run -d \
       -p 9001:9001 \
       --name=portainer_agent \

ct/dockge.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-18}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -27,11 +27,17 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  msg_info "Updating ${APP}"
+
+  msg_info "Updating base system"
+  $STD apt update
+  $STD apt upgrade -y
+  msg_ok "Base system updated"
+
+  msg_info "Updating Dockge"
   cd /opt/dockge
   $STD docker compose pull
   $STD docker compose up -d
-  msg_ok "Updated ${APP}"
+  msg_ok "Updated Dockge"
   msg_ok "Updated successfully!"
   exit
 }

ct/headers/apache-couchdb

@@ -1,6 +1,6 @@
-    ___                     __               ______                 __    ____  ____ 
-   /   |  ____  ____ ______/ /_  ___        / ____/___  __  _______/ /_  / __ \/ __ )
-  / /| | / __ \/ __ `/ ___/ __ \/ _ \______/ /   / __ \/ / / / ___/ __ \/ / / / __  |
- / ___ |/ /_/ / /_/ / /__/ / / /  __/_____/ /___/ /_/ / /_/ / /__/ / / / /_/ / /_/ / 
-/_/  |_/ .___/\__,_/\___/_/ /_/\___/      \____/\____/\__,_/\___/_/ /_/_____/_____/  
-      /_/                                                                            
+    ___                     __            ______                 __    ____  ____ 
+   /   |  ____  ____ ______/ /_  ___     / ____/___  __  _______/ /_  / __ \/ __ )
+  / /| | / __ \/ __ `/ ___/ __ \/ _ \   / /   / __ \/ / / / ___/ __ \/ / / / __  |
+ / ___ |/ /_/ / /_/ / /__/ / / /  __/  / /___/ /_/ / /_/ / /__/ / / / /_/ / /_/ / 
+/_/  |_/ .___/\__,_/\___/_/ /_/\___/   \____/\____/\__,_/\___/_/ /_/_____/_____/  
+      /_/                                                                         

ct/homer.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-512}"
 var_disk="${var_disk:-2}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -27,36 +27,31 @@ function update_script() {
         msg_error "No ${APP} Installation Found!"
         exit
     fi
-    msg_info "Stopping Service"
-    systemctl stop homer
-    msg_ok "Stopped Service"
 
-    msg_info "Backing up assets directory"
-    cd ~
-    mkdir -p assets-backup
-    cp -R /opt/homer/assets/. assets-backup
-    msg_ok "Backed up assets directory"
+    if check_for_gh_release "homer" "bastienwirtz/homer"; then
+      msg_info "Stopping Service"
+      systemctl stop homer
+      msg_ok "Stopped Service"
 
-    msg_info "Updating ${APP}"
-    rm -rf /opt/homer/*
-    cd /opt/homer
-    curl -fsSL "https://github.com/bastienwirtz/homer/releases/latest/download/homer.zip" -o $(basename "https://github.com/bastienwirtz/homer/releases/latest/download/homer.zip")
-    $STD unzip homer.zip
-    msg_ok "Updated ${APP}"
+      msg_info "Backing up assets directory"
+      cd ~
+      mkdir -p assets-backup
+      cp -R /opt/homer/assets/. assets-backup
+      msg_ok "Backed up assets directory"
 
-    msg_info "Restoring assets directory"
-    cd ~
-    cp -Rf assets-backup/. /opt/homer/assets/
-    msg_ok "Restored assets directory"
+      CLEAN_INSTALL=1 fetch_and_deploy_gh_release "homer" "bastienwirtz/homer" "prebuild" "latest" "/opt/homer" "homer.zip"
 
-    msg_info "Cleaning"
-    rm -rf assets-backup /opt/homer/homer.zip
-    msg_ok "Cleaned"
-
-    msg_info "Starting Service"
-    systemctl start homer
-    msg_ok "Started Service"
-    msg_ok "Updated successfully!"
+      msg_info "Restoring assets directory"
+      cd ~
+      cp -Rf assets-backup/. /opt/homer/assets/
+      rm -rf assets-backup
+      msg_ok "Restored assets directory"
+    
+      msg_info "Starting Service"
+      systemctl start homer
+      msg_ok "Started Service"
+      msg_ok "Updated successfully!"
+    fi
     exit
 }
 

ct/infisical.sh

@@ -33,6 +33,7 @@ function update_script() {
   msg_ok "Service stopped"
 
   msg_info "Creating backup"
+  [[ -f /opt/infisical_backup.sql ]] && rm -f /opt/infisical_backup.sql
   DB_PASS=$(grep -Po '(?<=^Database Password:\s).*' ~/infisical.creds | head -n1)
   PGPASSWORD=$DB_PASS pg_dump -U infisical -h localhost -d infisical_db > /opt/infisical_backup.sql
   msg_ok "Created backup"

ct/influxdb.sh

@@ -43,4 +43,4 @@ description
 msg_ok "Completed successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP} and Port 8888 for v1 or Port 8086 (v2)${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP} and Port 8888 for v1, Port 8086 for v2 or Port 8181 for v3${CL}"

frontend/public/json/apache-cassandra.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": null,
   "documentation": "https://cassandra.apache.org/doc/latest/",
@@ -23,7 +23,7 @@
         "ram": 2048,
         "hdd": 4,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],

frontend/public/json/apache-couchdb.json

@@ -1,19 +1,19 @@
 {
-  "name": "Apache-CouchDB",
+  "name": "Apache CouchDB",
   "slug": "apache-couchdb",
   "categories": [
     8
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 5984,
   "documentation": "https://docs.couchdb.org/en/stable/",
   "website": "https://couchdb.apache.org/",
   "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/couchdb.webp",
   "config_path": "etc/default.ini",
-  "description": "Apache-CouchDB Seamless multi-master sync, that scales from Big Data to Mobile, with an Intuitive HTTP/JSON API and designed for Reliability.",
+  "description": "Apache CouchDB Seamless multi-master sync, that scales from Big Data to Mobile, with an Intuitive HTTP/JSON API and designed for Reliability.",
   "install_methods": [
     {
       "type": "default",
@@ -23,7 +23,7 @@
         "ram": 4096,
         "hdd": 10,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
@@ -33,7 +33,7 @@
   },
   "notes": [
     {
-      "text": "Show Login Credentials: `cat CouchDB.creds`",
+      "text": "Login Credentials: `cat ~/couchdb.creds`",
       "type": "info"
     }
   ]

frontend/public/json/apache-guacamole.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-12-19",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8080,
   "documentation": "https://guacamole.apache.org/doc/gug/",

frontend/public/json/apache-tomcat.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2025-03-04",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8080,
   "documentation": "https://cwiki.apache.org/confluence/display/TOMCAT",
@@ -23,7 +23,7 @@
         "ram": 1024,
         "hdd": 5,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],

frontend/public/json/argus.json

@@ -20,10 +20,10 @@
       "script": "ct/argus.sh",
       "resources": {
         "cpu": 1,
-        "ram": 256,
+        "ram": 512,
         "hdd": 3,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],

frontend/public/json/booklore.json

@@ -23,7 +23,7 @@
         "ram": 3072,
         "hdd": 7,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],

frontend/public/json/cockpit.json

@@ -23,7 +23,7 @@
         "ram": 1024,
         "hdd": 4,
         "os": "debian",
-        "version": "13"
+        "version": "12"
       }
     }
   ],

frontend/public/json/docker.json

@@ -23,7 +23,7 @@
         "ram": 2048,
         "hdd": 4,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     },
     {

frontend/public/json/dockge.json

@@ -23,7 +23,7 @@
         "ram": 2048,
         "hdd": 18,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],

frontend/public/json/jellystat.json

@@ -0,0 +1,48 @@
+{
+  "name": "Jellystat",
+  "slug": "jellystat",
+  "categories": [
+    9
+  ],
+  "date_created": "2026-01-12",
+  "type": "addon",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 3000,
+  "documentation": "https://github.com/CyferShepard/Jellystat",
+  "website": "https://github.com/CyferShepard/Jellystat",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/jellystat.webp",
+  "config_path": "/opt/jellystat/.env",
+  "description": "A free and open source statistics app for Jellyfin",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "tools/addon/jellystat.sh",
+      "resources": {
+        "cpu": null,
+        "ram": null,
+        "hdd": null,
+        "os": null,
+        "version": null
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": [
+    {
+      "text": "Requires Node.js 20+ and PostgreSQL (auto-installed if missing)",
+      "type": "info"
+    },
+    {
+      "text": "Default PostgreSQL credentials: jellystat / jellystat",
+      "type": "info"
+    },
+    {
+      "text": "Update with: update_jellystat",
+      "type": "info"
+    }
+  ]
+}

frontend/public/json/versions.json

@@ -1,4 +1,234 @@
 [
+  {
+    "name": "henrygd/beszel",
+    "version": "v0.18.2",
+    "date": "2026-01-12T23:58:00Z"
+  },
+  {
+    "name": "gtsteffaniak/filebrowser",
+    "version": "v1.1.1-stable",
+    "date": "2026-01-12T23:25:10Z"
+  },
+  {
+    "name": "librenms/librenms",
+    "version": "26.1.1",
+    "date": "2026-01-12T23:12:41Z"
+  },
+  {
+    "name": "azukaar/Cosmos-Server",
+    "version": "v0.19.1",
+    "date": "2026-01-12T20:20:08Z"
+  },
+  {
+    "name": "ollama/ollama",
+    "version": "v0.14.0-rc1",
+    "date": "2026-01-10T05:09:46Z"
+  },
+  {
+    "name": "Infisical/infisical",
+    "version": "v0.155.2",
+    "date": "2026-01-12T21:52:20Z"
+  },
+  {
+    "name": "fccview/jotty",
+    "version": "1.17.1",
+    "date": "2026-01-12T21:34:44Z"
+  },
+  {
+    "name": "influxdata/telegraf",
+    "version": "v1.37.1",
+    "date": "2026-01-12T21:05:24Z"
+  },
+  {
+    "name": "chrisbenincasa/tunarr",
+    "version": "v1.1.0-dev.1",
+    "date": "2026-01-12T21:02:34Z"
+  },
+  {
+    "name": "Jackett/Jackett",
+    "version": "v0.24.831",
+    "date": "2026-01-12T20:54:11Z"
+  },
+  {
+    "name": "gristlabs/grist-core",
+    "version": "v1.7.10",
+    "date": "2026-01-12T20:50:50Z"
+  },
+  {
+    "name": "rcourtman/Pulse",
+    "version": "v5.0.16",
+    "date": "2026-01-12T20:18:34Z"
+  },
+  {
+    "name": "Whisparr/Whisparr",
+    "version": "v3.1.0.2109",
+    "date": "2026-01-12T20:09:42Z"
+  },
+  {
+    "name": "BerriAI/litellm",
+    "version": "v1.80.15.dev1",
+    "date": "2026-01-12T19:58:30Z"
+  },
+  {
+    "name": "Stirling-Tools/Stirling-PDF",
+    "version": "v2.2.1",
+    "date": "2026-01-12T19:44:31Z"
+  },
+  {
+    "name": "coder/code-server",
+    "version": "v4.108.0",
+    "date": "2026-01-12T19:24:55Z"
+  },
+  {
+    "name": "metabase/metabase",
+    "version": "v0.58.x",
+    "date": "2026-01-12T19:00:57Z"
+  },
+  {
+    "name": "release-argus/Argus",
+    "version": "0.29.2",
+    "date": "2026-01-12T18:56:44Z"
+  },
+  {
+    "name": "jupyter/notebook",
+    "version": "@jupyter-notebook/ui-components@7.6.0-alpha.1",
+    "date": "2026-01-12T17:53:14Z"
+  },
+  {
+    "name": "dgtlmoon/changedetection.io",
+    "version": "0.52.1",
+    "date": "2026-01-12T16:54:03Z"
+  },
+  {
+    "name": "msgbyte/tianji",
+    "version": "v1.31.6",
+    "date": "2026-01-12T16:47:36Z"
+  },
+  {
+    "name": "semaphoreui/semaphore",
+    "version": "v2.16.51",
+    "date": "2026-01-12T16:26:38Z"
+  },
+  {
+    "name": "slskd/slskd",
+    "version": "0.24.2",
+    "date": "2026-01-12T15:46:08Z"
+  },
+  {
+    "name": "laurent22/joplin",
+    "version": "server-v3.5.2",
+    "date": "2025-12-19T21:28:55Z"
+  },
+  {
+    "name": "n8n-io/n8n",
+    "version": "n8n@2.2.6",
+    "date": "2026-01-09T13:53:10Z"
+  },
+  {
+    "name": "meilisearch/meilisearch",
+    "version": "latest",
+    "date": "2026-01-12T13:26:02Z"
+  },
+  {
+    "name": "TuroYT/snowshare",
+    "version": "v1.2.8",
+    "date": "2026-01-12T12:12:05Z"
+  },
+  {
+    "name": "home-assistant/core",
+    "version": "2026.1.1",
+    "date": "2026-01-12T10:52:35Z"
+  },
+  {
+    "name": "TryGhost/Ghost-CLI",
+    "version": "v1.28.4",
+    "date": "2026-01-12T10:04:28Z"
+  },
+  {
+    "name": "bunkerity/bunkerweb",
+    "version": "v1.6.7",
+    "date": "2026-01-12T09:54:36Z"
+  },
+  {
+    "name": "firefly-iii/firefly-iii",
+    "version": "v6.4.15",
+    "date": "2026-01-06T20:05:54Z"
+  },
+  {
+    "name": "morpheus65535/bazarr",
+    "version": "v1.5.4",
+    "date": "2026-01-04T22:41:00Z"
+  },
+  {
+    "name": "rustdesk/rustdesk-server",
+    "version": "1.1.14",
+    "date": "2025-01-25T12:48:28Z"
+  },
+  {
+    "name": "OliveTin/OliveTin",
+    "version": "3000.9.0",
+    "date": "2026-01-12T00:37:54Z"
+  },
+  {
+    "name": "steveiliop56/tinyauth",
+    "version": "v4.1.0",
+    "date": "2025-11-23T12:13:34Z"
+  },
+  {
+    "name": "jeedom/core",
+    "version": "4.5.2",
+    "date": "2026-01-12T00:27:04Z"
+  },
+  {
+    "name": "hargata/lubelog",
+    "version": "v1.5.7",
+    "date": "2026-01-11T19:31:59Z"
+  },
+  {
+    "name": "scanopy/scanopy",
+    "version": "v0.13.5",
+    "date": "2026-01-11T19:03:33Z"
+  },
+  {
+    "name": "alexta69/metube",
+    "version": "2026.01.11",
+    "date": "2026-01-11T18:43:56Z"
+  },
+  {
+    "name": "keycloak/keycloak",
+    "version": "26.5.0",
+    "date": "2026-01-06T07:42:32Z"
+  },
+  {
+    "name": "ghostfolio/ghostfolio",
+    "version": "2.229.0",
+    "date": "2026-01-11T16:04:16Z"
+  },
+  {
+    "name": "pocket-id/pocket-id",
+    "version": "v2.2.0",
+    "date": "2026-01-11T15:01:07Z"
+  },
+  {
+    "name": "toniebox-reverse-engineering/teddycloud",
+    "version": "tc_v0.6.7",
+    "date": "2026-01-11T12:00:06Z"
+  },
+  {
+    "name": "karlomikus/bar-assistant",
+    "version": "v5.12.0",
+    "date": "2026-01-11T09:37:23Z"
+  },
+  {
+    "name": "Cleanuparr/Cleanuparr",
+    "version": "v2.5.1",
+    "date": "2026-01-11T00:46:17Z"
+  },
+  {
+    "name": "owncast/owncast",
+    "version": "v0.2.4",
+    "date": "2026-01-10T23:34:29Z"
+  },
   {
     "name": "Ombi-app/Ombi",
     "version": "v4.53.4",
@@ -19,100 +249,35 @@
     "version": "6.0.0",
     "date": "2026-01-10T20:28:07Z"
   },
-  {
-    "name": "rcourtman/Pulse",
-    "version": "v5.0.14",
-    "date": "2026-01-10T19:22:05Z"
-  },
   {
     "name": "blakeblackshear/frigate",
     "version": "v0.14.1",
     "date": "2024-08-29T22:32:51Z"
   },
-  {
-    "name": "firefly-iii/firefly-iii",
-    "version": "v6.4.15",
-    "date": "2026-01-06T20:05:54Z"
-  },
-  {
-    "name": "scanopy/scanopy",
-    "version": "v0.13.4",
-    "date": "2026-01-10T16:31:07Z"
-  },
-  {
-    "name": "alexta69/metube",
-    "version": "2026.01.10",
-    "date": "2026-01-10T16:29:55Z"
-  },
   {
     "name": "theonedev/onedev",
     "version": "v14.0.7",
-    "date": "2026-01-10T10:31:47Z"
-  },
-  {
-    "name": "chrisbenincasa/tunarr",
-    "version": "v1.1.0-dev.0",
-    "date": "2026-01-10T12:48:39Z"
-  },
-  {
-    "name": "laurent22/joplin",
-    "version": "server-v3.5.2",
-    "date": "2025-12-19T21:28:55Z"
+    "date": "2026-01-10T15:10:54Z"
   },
   {
     "name": "pocketbase/pocketbase",
     "version": "v0.35.1",
     "date": "2026-01-10T09:23:24Z"
   },
-  {
-    "name": "ollama/ollama",
-    "version": "v0.14.0-rc1",
-    "date": "2026-01-10T05:09:46Z"
-  },
   {
     "name": "Kozea/Radicale",
     "version": "v3.6.0",
     "date": "2026-01-10T06:56:46Z"
   },
-  {
-    "name": "Jackett/Jackett",
-    "version": "v0.24.807",
-    "date": "2026-01-10T06:27:46Z"
-  },
-  {
-    "name": "Whisparr/Whisparr",
-    "version": "v3.1.0.2093",
-    "date": "2026-01-10T04:47:03Z"
-  },
-  {
-    "name": "jeedom/core",
-    "version": "4.5.2",
-    "date": "2026-01-10T00:27:04Z"
-  },
-  {
-    "name": "steveiliop56/tinyauth",
-    "version": "v4.1.0",
-    "date": "2025-11-23T12:13:34Z"
-  },
-  {
-    "name": "coder/code-server",
-    "version": "v4.107.1",
-    "date": "2026-01-09T19:41:18Z"
-  },
   {
     "name": "booklore-app/booklore",
     "version": "v1.17.0",
     "date": "2026-01-09T22:48:21Z"
   },
-  {
-    "name": "Stirling-Tools/Stirling-PDF",
-    "version": "v2.2.0",
-    "date": "2026-01-09T22:10:33Z"
-  },
   {
     "name": "livebook-dev/livebook",
-    "version": "nightly",
-    "date": "2026-01-09T22:07:03Z"
+    "version": "v0.18.2",
+    "date": "2025-12-15T19:17:42Z"
   },
   {
     "name": "endurain-project/endurain",
@@ -129,36 +294,16 @@
     "version": "v1.50.0",
     "date": "2026-01-09T19:27:03Z"
   },
-  {
-    "name": "BerriAI/litellm",
-    "version": "v1.80.13.rc.1",
-    "date": "2026-01-09T19:18:51Z"
-  },
-  {
-    "name": "keycloak/keycloak",
-    "version": "26.5.0",
-    "date": "2026-01-06T07:42:32Z"
-  },
   {
     "name": "dani-garcia/vaultwarden",
     "version": "1.35.2",
     "date": "2026-01-09T18:37:04Z"
   },
-  {
-    "name": "metabase/metabase",
-    "version": "v0.57.x",
-    "date": "2026-01-09T18:12:58Z"
-  },
   {
     "name": "YunoHost/yunohost",
     "version": "debian/12.1.39",
     "date": "2026-01-09T18:06:09Z"
   },
-  {
-    "name": "bunkerity/bunkerweb",
-    "version": "v1.6.7",
-    "date": "2026-01-09T17:45:02Z"
-  },
   {
     "name": "saltstack/salt",
     "version": "v3007.11",
@@ -174,11 +319,6 @@
     "version": "r8.2.4-alpha1",
     "date": "2026-01-09T16:17:01Z"
   },
-  {
-    "name": "n8n-io/n8n",
-    "version": "n8n@2.2.6",
-    "date": "2026-01-09T13:53:10Z"
-  },
   {
     "name": "dedicatedcode/reitti",
     "version": "v3.2.1",
@@ -194,11 +334,6 @@
     "version": "0.300.3",
     "date": "2026-01-09T10:40:48Z"
   },
-  {
-    "name": "semaphoreui/semaphore",
-    "version": "v2.16.50",
-    "date": "2026-01-09T05:53:15Z"
-  },
   {
     "name": "jenkinsci/jenkins",
     "version": "jenkins-2.545",
@@ -209,11 +344,6 @@
     "version": "v1.20.1",
     "date": "2026-01-09T01:30:37Z"
   },
-  {
-    "name": "gristlabs/grist-core",
-    "version": "v1.7.9",
-    "date": "2026-01-09T01:26:51Z"
-  },
   {
     "name": "hyperion-project/hyperion.ng",
     "version": "2.1.1",
@@ -239,21 +369,11 @@
     "version": "v5.0.0-alpha0",
     "date": "2025-12-31T01:18:10Z"
   },
-  {
-    "name": "msgbyte/tianji",
-    "version": "v1.31.4",
-    "date": "2026-01-08T17:56:23Z"
-  },
   {
     "name": "MediaBrowser/Emby.Releases",
     "version": "4.9.3.0",
     "date": "2026-01-08T16:08:34Z"
   },
-  {
-    "name": "meilisearch/meilisearch",
-    "version": "prototype-v1.30.1-greedy-semantic-search.2",
-    "date": "2026-01-08T15:59:28Z"
-  },
   {
     "name": "plexguide/Huntarr.io",
     "version": "8.2.11",
@@ -284,11 +404,6 @@
     "version": "v13.0.4",
     "date": "2026-01-08T10:36:18Z"
   },
-  {
-    "name": "fccview/jotty",
-    "version": "1.16.1",
-    "date": "2026-01-08T10:10:26Z"
-  },
   {
     "name": "requarks/wiki",
     "version": "v2.5.311",
@@ -299,11 +414,6 @@
     "version": "v11.1.2",
     "date": "2025-12-17T09:26:24Z"
   },
-  {
-    "name": "morpheus65535/bazarr",
-    "version": "v1.5.4",
-    "date": "2026-01-04T22:41:00Z"
-  },
   {
     "name": "Comfy-Org/ComfyUI",
     "version": "v0.8.2",
@@ -334,16 +444,6 @@
     "version": "v2026-01-07",
     "date": "2026-01-07T18:50:28Z"
   },
-  {
-    "name": "home-assistant/core",
-    "version": "2026.1.0",
-    "date": "2026-01-07T17:38:27Z"
-  },
-  {
-    "name": "TuroYT/snowshare",
-    "version": "v1.2.7",
-    "date": "2026-01-07T17:12:21Z"
-  },
   {
     "name": "node-red/node-red",
     "version": "4.1.3",
@@ -389,11 +489,6 @@
     "version": "2.2.16",
     "date": "2026-01-07T03:26:27Z"
   },
-  {
-    "name": "Cleanuparr/Cleanuparr",
-    "version": "v2.5.0",
-    "date": "2026-01-07T01:06:23Z"
-  },
   {
     "name": "kimai/kimai",
     "version": "2.46.0",
@@ -404,11 +499,6 @@
     "version": "v1.2.0",
     "date": "2026-01-06T23:02:46Z"
   },
-  {
-    "name": "release-argus/Argus",
-    "version": "0.29.1",
-    "date": "2026-01-06T22:45:12Z"
-  },
   {
     "name": "tailscale/tailscale",
     "version": "v1.92.5",
@@ -464,16 +554,6 @@
     "version": "1.14.1-s.2",
     "date": "2026-01-06T02:46:38Z"
   },
-  {
-    "name": "Infisical/infisical",
-    "version": "v0.155.1",
-    "date": "2026-01-06T02:33:13Z"
-  },
-  {
-    "name": "gtsteffaniak/filebrowser",
-    "version": "v1.1.6-beta",
-    "date": "2026-01-06T00:42:11Z"
-  },
   {
     "name": "pterodactyl/wings",
     "version": "v1.12.0",
@@ -514,11 +594,6 @@
     "version": "v2.4.0",
     "date": "2026-01-04T21:10:51Z"
   },
-  {
-    "name": "pocket-id/pocket-id",
-    "version": "v2.1.0",
-    "date": "2026-01-04T20:32:58Z"
-  },
   {
     "name": "actualbudget/actual",
     "version": "v26.1.0",
@@ -534,11 +609,6 @@
     "version": "v0.16.0",
     "date": "2026-01-04T01:18:19Z"
   },
-  {
-    "name": "ghostfolio/ghostfolio",
-    "version": "2.228.0",
-    "date": "2026-01-03T16:38:36Z"
-  },
   {
     "name": "TwiN/gatus",
     "version": "v5.34.0",
@@ -557,7 +627,7 @@
   {
     "name": "mealie-recipes/mealie",
     "version": "v3.9.2",
-    "date": "2026-01-02T19:40:19Z"
+    "date": "2026-01-02T19:40:09Z"
   },
   {
     "name": "Dokploy/dokploy",
@@ -614,11 +684,6 @@
     "version": "1.1.0",
     "date": "2025-12-30T04:42:18Z"
   },
-  {
-    "name": "karlomikus/bar-assistant",
-    "version": "v5.11.2",
-    "date": "2025-12-29T21:09:41Z"
-  },
   {
     "name": "traefik/traefik",
     "version": "v3.6.6",
@@ -644,11 +709,6 @@
     "version": "v4.7.0",
     "date": "2025-12-27T20:37:54Z"
   },
-  {
-    "name": "hargata/lubelog",
-    "version": "v1.5.6",
-    "date": "2025-12-27T20:29:53Z"
-  },
   {
     "name": "sysadminsmedia/homebox",
     "version": "v0.22.3",
@@ -659,11 +719,6 @@
     "version": "preview-music-support",
     "date": "2025-12-26T22:24:19Z"
   },
-  {
-    "name": "toniebox-reverse-engineering/teddycloud",
-    "version": "tc_v0.6.6",
-    "date": "2025-12-26T18:45:22Z"
-  },
   {
     "name": "HydroshieldMKII/Guardian",
     "version": "v1.3.3",
@@ -674,11 +729,6 @@
     "version": "3.4.0",
     "date": "2025-12-25T16:00:55Z"
   },
-  {
-    "name": "OliveTin/OliveTin",
-    "version": "3000.8.0",
-    "date": "2025-12-25T15:10:19Z"
-  },
   {
     "name": "PatchMon/PatchMon",
     "version": "v1.3.7",
@@ -854,11 +904,6 @@
     "version": "v2.8.0",
     "date": "2025-12-12T20:25:00Z"
   },
-  {
-    "name": "jupyter/notebook",
-    "version": "@jupyter-notebook/ui-components@7.6.0-alpha.0",
-    "date": "2025-12-17T08:35:55Z"
-  },
   {
     "name": "grafana/grafana",
     "version": "v12.3.1",
@@ -869,11 +914,6 @@
     "version": "1.1.7",
     "date": "2025-12-16T21:44:58Z"
   },
-  {
-    "name": "azukaar/Cosmos-Server",
-    "version": "v0.19.0",
-    "date": "2025-12-15T19:43:03Z"
-  },
   {
     "name": "opencloud-eu/opencloud",
     "version": "v4.1.0",
@@ -889,11 +929,6 @@
     "version": "v0.30.0",
     "date": "2025-12-15T17:23:59Z"
   },
-  {
-    "name": "librenms/librenms",
-    "version": "25.12.0",
-    "date": "2025-12-15T14:06:00Z"
-  },
   {
     "name": "LimeSurvey/LimeSurvey",
     "version": "6.16.2+251209",
@@ -1004,11 +1039,6 @@
     "version": "v0.0.9",
     "date": "2025-12-08T20:37:45Z"
   },
-  {
-    "name": "influxdata/telegraf",
-    "version": "v1.37.0",
-    "date": "2025-12-08T20:36:16Z"
-  },
   {
     "name": "AdguardTeam/AdGuardHome",
     "version": "v0.107.71",
@@ -1054,11 +1084,6 @@
     "version": "11.0.4",
     "date": "2025-12-04T09:26:37Z"
   },
-  {
-    "name": "henrygd/beszel",
-    "version": "v0.17.0",
-    "date": "2025-12-03T00:15:51Z"
-  },
   {
     "name": "apache/tomcat",
     "version": "10.1.50",
@@ -1074,11 +1099,6 @@
     "version": "v6.2.4",
     "date": "2025-12-02T17:47:52Z"
   },
-  {
-    "name": "slskd/slskd",
-    "version": "0.24.1",
-    "date": "2025-12-01T19:33:30Z"
-  },
   {
     "name": "OctoPrint/OctoPrint",
     "version": "1.11.5",
@@ -1114,11 +1134,6 @@
     "version": "v3.4.6",
     "date": "2025-11-29T02:43:00Z"
   },
-  {
-    "name": "dgtlmoon/changedetection.io",
-    "version": "0.51.4",
-    "date": "2025-11-28T12:26:59Z"
-  },
   {
     "name": "gotson/komga",
     "version": "1.23.6",
@@ -1534,11 +1549,6 @@
     "version": "1012-08-09",
     "date": "2025-08-10T13:50:58Z"
   },
-  {
-    "name": "TryGhost/Ghost-CLI",
-    "version": "v1.28.3",
-    "date": "2025-08-06T12:32:02Z"
-  },
   {
     "name": "Suwayomi/Suwayomi-Server",
     "version": "v2.1.1867",
@@ -1594,11 +1604,6 @@
     "version": "1.0.0",
     "date": "2025-05-12T07:39:23Z"
   },
-  {
-    "name": "owncast/owncast",
-    "version": "v0.2.3",
-    "date": "2025-05-10T21:14:45Z"
-  },
   {
     "name": "dotnetfactory/fluid-calendar",
     "version": "v1.4.0",
@@ -1689,11 +1694,6 @@
     "version": "v25.2.1",
     "date": "2025-02-06T20:41:28Z"
   },
-  {
-    "name": "rustdesk/rustdesk-server",
-    "version": "1.1.14",
-    "date": "2025-01-25T12:48:28Z"
-  },
   {
     "name": "petio-team/petio",
     "version": "v0.5.7",

install/apache-cassandra-install.sh

@@ -13,22 +13,16 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt-get install -y apt-transport-https
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Eclipse Temurin (Patience)"
-curl -fsSL "https://packages.adoptium.net/artifactory/api/gpg/key/public" | gpg --dearmor >/etc/apt/trusted.gpg.d/adoptium.gpg
-echo 'deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/adoptium.gpg] https://packages.adoptium.net/artifactory/deb bookworm main' >/etc/apt/sources.list.d/adoptium.list
-$STD apt-get update
-$STD apt-get install -y temurin-11-jdk
-msg_ok "Installed Eclipse Temurin"
+JAVA_VERSION="11" setup_java
 
 msg_info "Installing Apache Cassandra"
-curl -fsSL "https://downloads.apache.org/cassandra/KEYS" | gpg --dearmor >/etc/apt/trusted.gpg.d/cassandra.gpg
-echo "deb https://debian.cassandra.apache.org 41x main" >/etc/apt/sources.list.d/cassandra.sources.list
-$STD apt-get update
-$STD apt-get install -y cassandra cassandra-tools
+setup_deb822_repo \
+  "cassandra" \
+  "https://downloads.apache.org/cassandra/KEYS" \
+  "https://debian.cassandra.apache.org" \
+  "41x" \
+  "main"
+$STD apt install -y cassandra cassandra-tools
 sed -i -e 's/^rpc_address: localhost/#rpc_address: localhost/g' -e 's/^# rpc_interface: eth1/rpc_interface: eth0/g' /etc/cassandra/cassandra.yaml
 msg_ok "Installed Apache Cassandra"
 

install/apache-couchdb-install.sh

@@ -13,10 +13,6 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt-get install -y apt-transport-https
-msg_ok "Installed Dependencies"
-
 msg_info "Installing Apache CouchDB"
 ERLANG_COOKIE=$(openssl rand -base64 32)
 ADMIN_PASS="$(openssl rand -base64 18 | cut -c1-13)"
@@ -25,14 +21,19 @@ debconf-set-selections <<<"couchdb couchdb/mode select standalone"
 debconf-set-selections <<<"couchdb couchdb/bindaddress string 0.0.0.0"
 debconf-set-selections <<<"couchdb couchdb/adminpass password $ADMIN_PASS"
 debconf-set-selections <<<"couchdb couchdb/adminpass_again password $ADMIN_PASS"
-curl -fsSL https://couchdb.apache.org/repo/keys.asc | gpg --dearmor -o /usr/share/keyrings/couchdb-archive-keyring.gpg
-VERSION_CODENAME="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
-echo "deb [signed-by=/usr/share/keyrings/couchdb-archive-keyring.gpg] https://apache.jfrog.io/artifactory/couchdb-deb/ ${VERSION_CODENAME} main" >/etc/apt/sources.list.d/couchdb.sources.list
-$STD apt-get update
-$STD apt-get install -y couchdb
-echo -e "CouchDB Erlang Cookie: \e[32m$ERLANG_COOKIE\e[0m" >>~/CouchDB.creds
-echo -e "CouchDB Admin Password: \e[32m$ADMIN_PASS\e[0m" >>~/CouchDB.creds
-msg_ok "Installed Apache CouchDB."
+setup_deb822_repo \
+  "couchdb" \
+  "https://couchdb.apache.org/repo/keys.asc" \
+  "https://apache.jfrog.io/artifactory/couchdb-deb" \
+  "$(get_os_info codename)" \
+  "main"
+$STD apt install -y couchdb
+{
+  echo "CouchDB Credentials"
+  echo "CouchDB Erlang Cookie: $ERLANG_COOKIE"
+  echo "CouchDB Admin Password: $ADMIN_PASS"
+} >>~/couchdb.creds
+msg_ok "Installed Apache CouchDB"
 
 motd_ssh
 customize

install/apache-guacamole-install.sh

@@ -15,12 +15,11 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt install -y \
   build-essential \
-  jq \
   libcairo2-dev \
-  libturbojpeg0 \
+  libjpeg62-turbo-dev \
   libpng-dev \
   libtool-bin \
-  libossp-uuid-dev \
+  uuid-dev \
   libvncserver-dev \
   freerdp3-dev \
   libssh2-1-dev \
@@ -34,71 +33,60 @@ $STD apt install -y \
   libswscale-dev \
   libavcodec-dev \
   libavutil-dev \
-  libavformat-dev \
-  default-jdk
+  libavformat-dev
 msg_ok "Installed Dependencies"
 
+JAVA_VERSION="11" setup_java
 setup_mariadb
+MARIADB_DB_NAME="guacamole_db" MARIADB_DB_USER="guacamole_user" setup_mariadb_db
 
 msg_info "Setup Apache Tomcat"
-RELEASE=$(curl -fsSL https://dlcdn.apache.org/tomcat/tomcat-9/ | grep -oP '(?<=href=")v[^"/]+(?=/")' | sed 's/^v//' | sort -V | tail -n1)
-mkdir -p /opt/apache-guacamole/tomcat9
-mkdir -p /opt/apache-guacamole/server
-curl -fsSL "https://dlcdn.apache.org/tomcat/tomcat-9/v${RELEASE}/bin/apache-tomcat-${RELEASE}.tar.gz" | tar -xz -C /opt/apache-guacamole/tomcat9 --strip-components=1
+TOMCAT_VERSION=$(curl -fsSL https://dlcdn.apache.org/tomcat/tomcat-9/ | grep -oP '(?<=href=")v[^"/]+(?=/")' | sed 's/^v//' | sort -V | tail -n1)
+mkdir -p /opt/apache-guacamole/{tomcat9,server}
+curl -fsSL "https://dlcdn.apache.org/tomcat/tomcat-9/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz" | tar -xz -C /opt/apache-guacamole/tomcat9 --strip-components=1
 useradd -r -d /opt/apache-guacamole/tomcat9 -s /bin/false tomcat
 chown -R tomcat: /opt/apache-guacamole/tomcat9
 chmod -R g+r /opt/apache-guacamole/tomcat9/conf
 chmod g+x /opt/apache-guacamole/tomcat9/conf
-msg_ok "Setup Apache Tomcat"
+echo "${TOMCAT_VERSION}" >~/.guacamole_tomcat
+msg_ok "Setup Apache Tomcat ${TOMCAT_VERSION}"
 
 msg_info "Setup Apache Guacamole"
 mkdir -p /etc/guacamole/{extensions,lib}
-RELEASE_SERVER=$(curl -fsSL https://api.github.com/repos/apache/guacamole-server/tags | jq -r '.[].name' | grep -v -- '-RC' | head -n 1)
-curl -fsSL "https://api.github.com/repos/apache/guacamole-server/tarball/refs/tags/${RELEASE_SERVER}" | tar -xz --strip-components=1 -C /opt/apache-guacamole/server
+GUAC_SERVER_VERSION=$(curl -fsSL https://api.github.com/repos/apache/guacamole-server/tags | jq -r '.[].name' | grep -v -- '-RC' | head -n 1)
+GUAC_CLIENT_VERSION=$(curl -fsSL https://api.github.com/repos/apache/guacamole-client/tags | jq -r '.[].name' | grep -v -- '-RC' | head -n 1)
+MYSQL_CONNECTOR_VERSION=$(curl -fsSL "https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/maven-metadata.xml" | grep -oP '<latest>\K[^<]+')
+curl -fsSL "https://api.github.com/repos/apache/guacamole-server/tarball/refs/tags/${GUAC_SERVER_VERSION}" | tar -xz --strip-components=1 -C /opt/apache-guacamole/server
 cd /opt/apache-guacamole/server
 export CPPFLAGS="-Wno-error=deprecated-declarations"
 $STD autoreconf -fi
-$STD ./configure --with-init-dir=/etc/init.d --enable-allow-freerdp-snapshots --disable-guaclog
+$STD ./configure --with-init-dir=/etc/init.d --enable-allow-freerdp-snapshots
 $STD make
 $STD make install
 $STD ldconfig
-RELEASE_CLIENT=$(curl -fsSL https://api.github.com/repos/apache/guacamole-client/tags | jq -r '.[].name' | grep -v -- '-RC' | head -n 1)
-curl -fsSL "https://downloads.apache.org/guacamole/${RELEASE_CLIENT}/binary/guacamole-${RELEASE_CLIENT}.war" -o "/opt/apache-guacamole/tomcat9/webapps/guacamole.war"
-cd /root
-curl -fsSL "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-9.3.0.tar.gz" -o "/root/mysql-connector-j-9.3.0.tar.gz"
-$STD tar -xf ~/mysql-connector-j-9.3.0.tar.gz
-mv ~/mysql-connector-j-9.3.0/mysql-connector-j-9.3.0.jar /etc/guacamole/lib/
-curl -fsSL "https://downloads.apache.org/guacamole/${RELEASE_SERVER}/binary/guacamole-auth-jdbc-${RELEASE_SERVER}.tar.gz" -o "/root/guacamole-auth-jdbc-${RELEASE_SERVER}.tar.gz"
-$STD tar -xf ~/guacamole-auth-jdbc-"$RELEASE_SERVER".tar.gz
-mv ~/guacamole-auth-jdbc-"$RELEASE_SERVER"/mysql/guacamole-auth-jdbc-mysql-"$RELEASE_SERVER".jar /etc/guacamole/extensions/
-rm -rf ~/mysql-connector-j-9.3.0{,.tar.gz}
+echo "${GUAC_SERVER_VERSION}" >~/.guacamole_server
+curl -fsSL "https://downloads.apache.org/guacamole/${GUAC_CLIENT_VERSION}/binary/guacamole-${GUAC_CLIENT_VERSION}.war" -o "/opt/apache-guacamole/tomcat9/webapps/guacamole.war"
+echo "${GUAC_CLIENT_VERSION}" >~/.guacamole_client
+curl -fsSL "https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_CONNECTOR_VERSION}/mysql-connector-j-${MYSQL_CONNECTOR_VERSION}.jar" -o "/etc/guacamole/lib/mysql-connector-j.jar"
+echo "${MYSQL_CONNECTOR_VERSION}" >~/.guacamole_mysql_connector
+curl -fsSL "https://downloads.apache.org/guacamole/${GUAC_SERVER_VERSION}/binary/guacamole-auth-jdbc-${GUAC_SERVER_VERSION}.tar.gz" -o "/root/guacamole-auth-jdbc-${GUAC_SERVER_VERSION}.tar.gz"
+$STD tar -xf ~/guacamole-auth-jdbc-"$GUAC_SERVER_VERSION".tar.gz
+mv ~/guacamole-auth-jdbc-"$GUAC_SERVER_VERSION"/mysql/guacamole-auth-jdbc-mysql-"$GUAC_SERVER_VERSION".jar /etc/guacamole/extensions/
+echo "${GUAC_SERVER_VERSION}" >~/.guacamole_auth_jdbc
 msg_ok "Setup Apache Guacamole"
 
-msg_info "Setup Database"
-DB_NAME=guacamole_db
-DB_USER=guacamole_user
-DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
-$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
-$STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
-{
-  echo "Guacamole-Credentials"
-  echo "Database User: $DB_USER"
-  echo "Database Password: $DB_PASS"
-  echo "Database Name: $DB_NAME"
-} >>~/guacamole.creds
-cd guacamole-auth-jdbc-"${RELEASE_SERVER}"/mysql/schema
-cat *.sql | mariadb -u root ${DB_NAME}
+msg_info "Importing Database Schema"
+cd ~/guacamole-auth-jdbc-"${GUAC_SERVER_VERSION}"/mysql/schema
+cat *.sql | mariadb -u root ${MARIADB_DB_NAME}
 {
   echo "mysql-hostname: 127.0.0.1"
   echo "mysql-port: 3306"
-  echo "mysql-database: $DB_NAME"
-  echo "mysql-username: $DB_USER"
-  echo "mysql-password: $DB_PASS"
-
+  echo "mysql-database: $MARIADB_DB_NAME"
+  echo "mysql-username: $MARIADB_DB_USER"
+  echo "mysql-password: $MARIADB_DB_PASS"
 } >>/etc/guacamole/guacamole.properties
-rm -rf ~/guacamole-auth-jdbc-"$RELEASE_SERVER"{,.tar.gz}
-msg_ok "Setup Database"
+rm -rf ~/guacamole-auth-jdbc-"$GUAC_SERVER_VERSION"{,.tar.gz}
+msg_ok "Imported Database Schema"
 
 msg_info "Setup Service"
 cat <<EOF >/etc/guacamole/guacd.conf
@@ -143,7 +131,7 @@ PIDFile=/var/run/guacd.pid
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl -q enable --now mysql tomcat guacd
+systemctl enable -q --now mysql tomcat guacd
 msg_ok "Setup Service"
 
 motd_ssh

install/apache-tomcat-install.sh

@@ -13,19 +13,6 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  lsb-release \
-  apt-transport-https
-msg_ok "Installed Dependencies"
-
-msg_info "Setting up Adoptium Repository"
-mkdir -p /etc/apt/keyrings
-curl -fsSL "https://packages.adoptium.net/artifactory/api/gpg/key/public" | gpg --dearmor >/etc/apt/trusted.gpg.d/adoptium.gpg
-echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" >/etc/apt/sources.list.d/adoptium.list
-$STD apt-get update
-msg_ok "Set up Adoptium Repository"
-
 read -r -p "${TAB3}Which Tomcat version would you like to install? (9, 10.1, 11): " version
 case $version in
 9)
@@ -33,25 +20,8 @@ case $version in
   echo "Which LTS Java version would you like to use? (8, 11, 17, 21): "
   read -r jdk_version
   case $jdk_version in
-  8)
-    msg_info "Installing Temurin JDK 8 (LTS) for Tomcat $TOMCAT_VERSION"
-    $STD apt-get install -y temurin-8-jdk
-    msg_ok "Setup Temurin JDK 8 (LTS)"
-    ;;
-  11)
-    msg_info "Installing Temurin JDK 11 (LTS) for Tomcat $TOMCAT_VERSION"
-    $STD apt-get install -y temurin-11-jdk
-    msg_ok "Setup Temurin JDK 11 (LTS)"
-    ;;
-  17)
-    msg_info "Installing Temurin JDK 17 (LTS) for Tomcat $TOMCAT_VERSION"
-    $STD apt-get install -qqy temurin-17-jdk
-    msg_ok "Setup Temurin JDK 17 (LTS)"
-    ;;
-  21)
-    msg_info "Installing Temurin JDK 21 (LTS) for Tomcat $TOMCAT_VERSION"
-    $STD apt-get install -y temurin-21-jdk
-    msg_ok "Setup Temurin JDK 21 (LTS)"
+  8 | 11 | 17 | 21)
+    JAVA_VERSION="$jdk_version" setup_java
     ;;
   *)
     msg_error "Invalid JDK version selected. Please enter 8, 11, 17 or 21."
@@ -61,26 +31,14 @@ case $version in
   ;;
 10 | 10.1)
   TOMCAT_VERSION="10"
-  echo "Which LTS Java version would you like to use? (11, 17): "
+  echo "Which LTS Java version would you like to use? (11, 17, 21): "
   read -r jdk_version
   case $jdk_version in
-  11)
-    msg_info "Installing Temurin JDK 11 (LTS) for Tomcat $TOMCAT_VERSION"
-    $STD apt-get install -y temurin-11-jdk
-    msg_ok "Setup Temurin JDK 11"
-    ;;
-  17)
-    msg_info "Installing Temurin JDK 17 (LTS) for Tomcat $TOMCAT_VERSION"
-    $STD apt-get install -y temurin-17-jdk
-    msg_ok "Setup Temurin JDK 17"
-    ;;
-  21)
-    msg_info "Installing Temurin JDK 21 (LTS) for Tomcat $TOMCAT_VERSION"
-    $STD apt-get install -y temurin-21-jdk
-    msg_ok "Setup Temurin JDK 21 (LTS)"
+  11 | 17 | 21)
+    JAVA_VERSION="$jdk_version" setup_java
     ;;
   *)
-    msg_error "Invalid JDK version selected. Please enter 11 or 17."
+    msg_error "Invalid JDK version selected. Please enter 11, 17 or 21."
     exit 1
     ;;
   esac
@@ -90,15 +48,8 @@ case $version in
   echo "Which LTS Java version would you like to use? (17, 21): "
   read -r jdk_version
   case $jdk_version in
-  17)
-    msg_info "Installing Temurin JDK 17 (LTS) for Tomcat $TOMCAT_VERSION"
-    $STD apt-get install -qqy temurin-17-jdk
-    msg_ok "Setup Temurin JDK 17"
-    ;;
-  21)
-    msg_info "Installing Temurin JDK 21 (LTS) for Tomcat $TOMCAT_VERSION"
-    $STD apt-get install -y temurin-21-jdk
-    msg_ok "Setup Temurin JDK 21 (LTS)"
+  17 | 21)
+    JAVA_VERSION="$jdk_version" setup_java
     ;;
   *)
     msg_error "Invalid JDK version selected. Please enter 17 or 21."

install/booklore-install.sh

@@ -14,30 +14,15 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y nginx
+$STD apt install -y nginx
 msg_ok "Installed Dependencies"
 
-fetch_and_deploy_gh_release "booklore" "booklore-app/BookLore" "tarball"
 JAVA_VERSION="21" setup_java
 NODE_VERSION="22" setup_nodejs
 setup_mariadb
 setup_yq
-
-msg_info "Setting up database"
-DB_NAME=booklore_db
-DB_USER=booklore_user
-DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
-$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
-$STD mariadb -u root -e "GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER'@'localhost';"
-$STD mariadb -u root -e "GRANT SELECT ON \`mysql\`.\`time_zone_name\` TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
-{
-  echo "BookLore Database Credentials"
-  echo "Database: $DB_NAME"
-  echo "Username: $DB_USER"
-  echo "Password: $DB_PASS"
-} >>~/booklore.creds
-msg_ok "Set up database"
+MARIADB_DB_NAME="booklore_db" MARIADB_DB_USER="booklore_user" MARIADB_DB_EXTRA_GRANTS="GRANT SELECT ON \`mysql\`.\`time_zone_name\`" setup_mariadb_db
+fetch_and_deploy_gh_release "booklore" "booklore-app/BookLore" "tarball"
 
 msg_info "Building Frontend"
 cd /opt/booklore/booklore-ui
@@ -46,22 +31,22 @@ $STD npm run build --configuration=production
 msg_ok "Built Frontend"
 
 msg_info "Creating Environment"
-mkdir -p /opt/booklore_storage{/data,/books,/bookdrop}
+mkdir -p /opt/booklore_storage/{data,books,bookdrop}
 cat <<EOF >/opt/booklore_storage/.env
-DATABASE_URL=jdbc:mariadb://localhost:3306/$DB_NAME
-DATABASE_USERNAME=$DB_USER
-DATABASE_PASSWORD=$DB_PASS
-BOOKLORE_PORT=6060 
+# Database Configuration
+DATABASE_URL=jdbc:mariadb://localhost:3306/${MARIADB_DB_NAME}
+DATABASE_USERNAME=${MARIADB_DB_USER}
+DATABASE_PASSWORD=${MARIADB_DB_PASS}
 
-BOOKLORE_DATA_PATH=/opt/booklore_storage/data
-BOOKLORE_BOOKS_PATH=/opt/booklore_storage/books
-BOOKLORE_BOOKDROP_PATH=/opt/booklore_storage/bookdrop
+# App Configuration (Spring Boot mapping from app.* properties)
+APP_PATH_CONFIG=/opt/booklore_storage/data
+APP_BOOKDROP_FOLDER=/opt/booklore_storage/bookdrop
 EOF
 msg_ok "Created Environment"
 
 msg_info "Building Backend"
 cd /opt/booklore/booklore-api
-APP_VERSION=$(curl -fsSL https://api.github.com/repos/booklore-app/BookLore/releases/latest | yq '.tag_name' | sed 's/^v//')
+APP_VERSION=$(get_latest_github_release "booklore-app/BookLore")
 yq eval ".app.version = \"${APP_VERSION}\"" -i src/main/resources/application.yaml
 $STD ./gradlew clean build --no-daemon
 mkdir -p /opt/booklore/dist
@@ -73,22 +58,24 @@ fi
 cp "$JAR_PATH" /opt/booklore/dist/app.jar
 msg_ok "Built Backend"
 
-msg_info "Configure Nginx"
+msg_info "Configuring Nginx"
 rm -rf /usr/share/nginx/html
 ln -s /opt/booklore/booklore-ui/dist/booklore/browser /usr/share/nginx/html
+rm -f /etc/nginx/sites-enabled/default
 cp /opt/booklore/nginx.conf /etc/nginx/nginx.conf
 sed -i 's/listen \${BOOKLORE_PORT};/listen 6060;/' /etc/nginx/nginx.conf
 sed -i 's/listen \[::\]:${BOOKLORE_PORT};/listen [::]:6060;/' /etc/nginx/nginx.conf
 systemctl restart nginx
 msg_ok "Configured Nginx"
 
-msg_info "Creating Systemd Service"
+msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/booklore.service
 [Unit]
 Description=BookLore Java Service
-After=network.target
+After=network.target mariadb.service
 
 [Service]
+Type=simple
 User=root
 WorkingDirectory=/opt/booklore/dist
 ExecStart=/usr/bin/java -jar /opt/booklore/dist/app.jar
@@ -102,7 +89,7 @@ RestartSec=5
 WantedBy=multi-user.target
 EOF
 systemctl enable -q --now booklore
-msg_ok "Created BookLore Service"
+msg_ok "Created Service"
 
 motd_ssh
 customize

install/docker-install.sh

@@ -13,32 +13,17 @@ setting_up_container
 network_check
 update_os
 
-get_latest_release() {
-  curl -fsSL https://api.github.com/repos/"$1"/releases/latest | grep '"tag_name":' | cut -d'"' -f4
-}
+DOCKER_LATEST_VERSION=$(get_latest_github_release "moby/moby")
+PORTAINER_LATEST_VERSION=$(get_latest_github_release "portainer/portainer")
+PORTAINER_AGENT_LATEST_VERSION=$(get_latest_github_release "portainer/agent")
 
-DOCKER_LATEST_VERSION=$(get_latest_release "moby/moby")
-PORTAINER_LATEST_VERSION=$(get_latest_release "portainer/portainer")
-PORTAINER_AGENT_LATEST_VERSION=$(get_latest_release "portainer/agent")
-DOCKER_COMPOSE_LATEST_VERSION=$(get_latest_release "docker/compose")
-
-msg_info "Installing Docker $DOCKER_LATEST_VERSION"
+msg_info "Installing Docker $DOCKER_LATEST_VERSION (with Compose, Buildx)"
 DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
 mkdir -p $(dirname $DOCKER_CONFIG_PATH)
 echo -e '{\n  "log-driver": "journald"\n}' >/etc/docker/daemon.json
 $STD sh <(curl -fsSL https://get.docker.com)
 msg_ok "Installed Docker $DOCKER_LATEST_VERSION"
 
-read -r -p "${TAB3}Install Docker Compose v2 plugin? <y/N> " prompt_compose
-if [[ ${prompt_compose,,} =~ ^(y|yes)$ ]]; then
-  msg_info "Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
-  mkdir -p /usr/local/lib/docker/cli-plugins
-  curl -fsSL "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_LATEST_VERSION}/docker-compose-$(uname -s)-$(uname -m)" \
-    -o /usr/local/lib/docker/cli-plugins/docker-compose
-  chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
-  msg_ok "Installed Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
-fi
-
 read -r -p "${TAB3}Would you like to add Portainer (UI)? <y/N> " prompt
 if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
   msg_info "Installing Portainer $PORTAINER_LATEST_VERSION"

install/dockge-install.sh

@@ -13,27 +13,15 @@ setting_up_container
 network_check
 update_os
 
-get_latest_release() {
-  curl -fsSL https://api.github.com/repos/$1/releases/latest | grep '"tag_name":' | cut -d'"' -f4
-}
+DOCKER_LATEST_VERSION=$(get_latest_github_release "moby/moby")
 
-DOCKER_LATEST_VERSION=$(get_latest_release "moby/moby")
-DOCKER_COMPOSE_LATEST_VERSION=$(get_latest_release "docker/compose")
-
-msg_info "Installing Docker $DOCKER_LATEST_VERSION"
+msg_info "Installing Docker $DOCKER_LATEST_VERSION (with Compose, Buildx)"
 DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
 mkdir -p $(dirname $DOCKER_CONFIG_PATH)
 echo -e '{\n  "log-driver": "journald"\n}' >/etc/docker/daemon.json
 $STD sh <(curl -fsSL https://get.docker.com)
 msg_ok "Installed Docker $DOCKER_LATEST_VERSION"
 
-msg_info "Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
-DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
-mkdir -p $DOCKER_CONFIG/cli-plugins
-curl -fsSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_LATEST_VERSION/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
-chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
-msg_ok "Installed Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
-
 msg_info "Installing Dockge"
 mkdir -p /opt/{dockge,stacks}
 curl -fsSL "https://raw.githubusercontent.com/louislam/dockge/master/compose.yaml" -o "/opt/dockge/compose.yaml"

install/homer-install.sh

@@ -13,32 +13,25 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt-get install -y pip
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Homer"
-mkdir -p /opt/homer
-cd /opt/homer
-curl -fsSL "https://github.com/bastienwirtz/homer/releases/latest/download/homer.zip" -o "homer.zip"
-$STD unzip homer.zip
-rm -rf homer.zip
-cp assets/config.yml.dist assets/config.yml
-msg_ok "Installed Homer"
+fetch_and_deploy_gh_release "homer" "bastienwirtz/homer" "prebuild" "latest" "/opt/homer" "homer.zip"
+cp /opt/homer/assets/config.yml.dist /opt/homer/assets/config.yml
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/homer.service
 [Unit]
 Description=Homer Dashboard
 After=network-online.target
+Wants=network-online.target
+
 [Service]
 Type=simple
 WorkingDirectory=/opt/homer
 ExecStart=python3 -m http.server 8010
+
 [Install]
 WantedBy=multi-user.target
 EOF
-$STD systemctl enable --now homer
+systemctl enable -q --now homer
 msg_ok "Created Service"
 
 motd_ssh

install/hortusfox-install.sh

@@ -13,37 +13,18 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt install -y apache2
-msg_ok "Installed Dependencies"
-
 setup_mariadb
+MARIADB_DB_NAME="hortusfox" MARIADB_DB_USER="hortusfox" setup_mariadb_db
 PHP_MODULE="exif,mysql" PHP_APACHE="YES" PHP_FPM="NO" PHP_VERSION="8.3" setup_php
 setup_composer
-
-msg_info "Setting up database"
-DB_NAME=hortusfox
-DB_USER=hortusfox
-DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
-$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
-$STD mariadb -u root -e "GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
-{
-  echo "HortusFox Database Credentials"
-  echo "Database: $DB_NAME"
-  echo "Username: $DB_USER"
-  echo "Password: $DB_PASS"
-} >>~/hortusfox.creds
-msg_ok "Set up database"
-
 fetch_and_deploy_gh_release "hortusfox" "danielbrendel/hortusfox-web" "tarball"
 
 msg_info "Configuring .env"
 cp /opt/hortusfox/.env.example /opt/hortusfox/.env
 sed -i "s|^DB_HOST=.*|DB_HOST=localhost|" /opt/hortusfox/.env
-sed -i "s|^DB_USER=.*|DB_USER=$DB_USER|" /opt/hortusfox/.env
-sed -i "s|^DB_PASSWORD=.*|DB_PASSWORD=$DB_PASS|" /opt/hortusfox/.env
-sed -i "s|^DB_DATABASE=.*|DB_DATABASE=$DB_NAME|" /opt/hortusfox/.env
+sed -i "s|^DB_USER=.*|DB_USER=$MARIADB_DB_USER|" /opt/hortusfox/.env
+sed -i "s|^DB_PASSWORD=.*|DB_PASSWORD=$MARIADB_DB_PASS|" /opt/hortusfox/.env
+sed -i "s|^DB_DATABASE=.*|DB_DATABASE=$MARIADB_DB_NAME|" /opt/hortusfox/.env
 sed -i "s|^DB_ENABLE=.*|DB_ENABLE=true|" /opt/hortusfox/.env
 sed -i "s|^APP_TIMEZONE=.*|APP_TIMEZONE=Europe/Berlin|" /opt/hortusfox/.env
 msg_ok ".env configured"
@@ -58,20 +39,20 @@ $STD php asatru migrate:fresh
 msg_ok "Migration finished"
 
 msg_info "Setting up HortusFox"
-$STD mariadb -u root -D $DB_NAME -e "INSERT IGNORE INTO AppModel (workspace, language, created_at) VALUES ('Default Workspace', 'en', NOW());"
+$STD mariadb -u root -D $MARIADB_DB_NAME -e "INSERT IGNORE INTO AppModel (workspace, language, created_at) VALUES ('Default Workspace', 'en', NOW());"
 $STD php asatru plants:attributes
 $STD php asatru calendar:classes
 ADMIN_EMAIL="admin@example.com"
 ADMIN_PASS="$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)"
 ADMIN_HASH=$(php -r "echo password_hash('$ADMIN_PASS', PASSWORD_BCRYPT);")
-$STD mariadb -u root -D $DB_NAME -e "INSERT IGNORE INTO UserModel (name, email, password, admin) VALUES ('Admin', '$ADMIN_EMAIL', '$ADMIN_HASH', 1);"
+$STD mariadb -u root -D $MARIADB_DB_NAME -e "INSERT IGNORE INTO UserModel (name, email, password, admin) VALUES ('Admin', '$ADMIN_EMAIL', '$ADMIN_HASH', 1);"
 {
   echo ""
   echo "HortusFox-Admin-Creds:"
   echo "E-Mail: $ADMIN_EMAIL"
   echo "Passwort: $ADMIN_PASS"
 } >>~/hortusfox.creds
-$STD mariadb -u root -D $DB_NAME -e "INSERT IGNORE INTO LocationsModel (name, active, created_at) VALUES ('Home', 1, NOW());"
+$STD mariadb -u root -D $MARIADB_DB_NAME -e "INSERT IGNORE INTO LocationsModel (name, active, created_at) VALUES ('Home', 1, NOW());"
 msg_ok "Set up HortusFox"
 
 msg_info "Configuring Apache vHost"

install/infisical-install.sh

@@ -16,11 +16,12 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt install -y \
   apt-transport-https \
-  ca-certificates \
   redis
 msg_ok "Installed Dependencies"
 
 PG_VERSION="17" setup_postgresql
+PG_DB_NAME="infisical_db" PG_DB_USER="infisical" setup_postgresql_db
+import_local_ip
 
 msg_info "Setting up Infisical Repository"
 setup_deb822_repo \
@@ -30,34 +31,16 @@ setup_deb822_repo \
   "stable"
 msg_ok "Setup Infisical repository"
 
-msg_info "Configuring PostgreSQL"
-DB_NAME="infisical_db"
-DB_USER="infisical"
-DB_PASS="$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13)"
-$STD sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN PASSWORD '$DB_PASS';"
-$STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER ENCODING 'UTF8' TEMPLATE template0;"
-$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO 'utf8';"
-$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET default_transaction_isolation TO 'read committed';"
-$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC';"
-{
-  echo "Infiscal Credentials"
-  echo "Database Name: $DB_NAME"
-  echo "Database User: $DB_USER"
-  echo "Database Password: $DB_PASS"
-} >>~/infisical.creds
-msg_ok "Configured PostgreSQL"
-
 msg_info "Setting up Infisical"
 AUTH_SECRET="$(openssl rand -base64 32 | tr -d '\n')"
 ENC_KEY="$(openssl rand -hex 16 | tr -d '\n')"
-IP_ADDR=$(hostname -I | awk '{print $1}')
 $STD apt install -y infisical-core
 mkdir -p /etc/infisical
 cat <<EOF >/etc/infisical/infisical.rb
 infisical_core['ENCRYPTION_KEY'] = '$ENC_KEY'
 infisical_core['AUTH_SECRET'] = '$AUTH_SECRET'
-infisical_core['HOST'] = '$IP_ADDR'
-infisical_core['DB_CONNECTION_URI'] = 'postgres://${DB_USER}:${DB_PASS}@localhost:5432/${DB_NAME}'
+infisical_core['HOST'] = '$LOCAL_IP'
+infisical_core['DB_CONNECTION_URI'] = 'postgres://${PG_DB_USER}:${PG_DB_PASS}@localhost:5432/${PG_DB_NAME}'
 infisical_core['REDIS_URL'] = 'redis://localhost:6379'
 EOF
 $STD infisical-ctl reconfigure

install/influxdb-install.sh

@@ -21,23 +21,29 @@ setup_deb822_repo \
   "stable"
 msg_ok "Set up InfluxDB Repository"
 
-read -r -p "${TAB3}Which version of InfluxDB to install? (1 or 2) " prompt
-if [[ $prompt == "2" ]]; then
+read -r -p "${TAB3}Which version of InfluxDB to install? (1, 2 or 3) " prompt
+if [[ $prompt == "3" ]]; then
+  INFLUX="3"
+elif [[ $prompt == "2" ]]; then
   INFLUX="2"
 else
   INFLUX="1"
 fi
 
-msg_info "Installing InfluxDB"
-if [[ $INFLUX == "2" ]]; then
+msg_info "Installing InfluxDB v${INFLUX}"
+if [[ $INFLUX == "3" ]]; then
+  $STD apt install -y influxdb3-core
+  systemctl enable -q --now influxdb3-core
+elif [[ $INFLUX == "2" ]]; then
   $STD apt install -y influxdb2
+  systemctl enable -q --now influxdb
 else
   $STD apt install -y influxdb
   download_file "https://dl.influxdata.com/chronograf/releases/chronograf_1.10.8_amd64.deb" "${HOME}/chronograf_1.10.8_amd64.deb"
   $STD dpkg -i "${HOME}/chronograf_1.10.8_amd64.deb"
   rm -rf "${HOME}/chronograf_1.10.8_amd64.deb"
+  systemctl enable -q --now influxdb
 fi
-systemctl enable -q --now influxdb
 msg_ok "Installed InfluxDB"
 
 read -r -p "${TAB3}Would you like to add Telegraf? <y/N> " prompt

install/invoiceninja-install.sh

@@ -106,6 +106,7 @@ $STD php artisan migrate --force
 $STD php artisan db:seed --force
 $STD php artisan ninja:post-update
 $STD php artisan optimize
+chown -R www-data:www-data /opt/invoiceninja
 msg_ok "Set up Database"
 
 msg_info "Configuring Nginx"

misc/build.func

@@ -231,6 +231,100 @@ install_ssh_keys_into_ct() {
   return 0
 }
 
+# ------------------------------------------------------------------------------
+# validate_container_id()
+#
+# - Validates if a container ID is available for use
+# - Checks if ID is already used by VM or LXC container
+# - Checks if ID is used in LVM logical volumes
+# - Returns 0 if ID is available, 1 if already in use
+# ------------------------------------------------------------------------------
+validate_container_id() {
+  local ctid="$1"
+
+  # Check if ID is numeric
+  if ! [[ "$ctid" =~ ^[0-9]+$ ]]; then
+    return 1
+  fi
+
+  # Check if config file exists for VM or LXC
+  if [[ -f "/etc/pve/qemu-server/${ctid}.conf" ]] || [[ -f "/etc/pve/lxc/${ctid}.conf" ]]; then
+    return 1
+  fi
+
+  # Check if ID is used in LVM logical volumes
+  if lvs --noheadings -o lv_name 2>/dev/null | grep -qE "(^|[-_])${ctid}($|[-_])"; then
+    return 1
+  fi
+
+  return 0
+}
+
+# ------------------------------------------------------------------------------
+# get_valid_container_id()
+#
+# - Returns a valid, unused container ID
+# - If provided ID is valid, returns it
+# - Otherwise increments from suggested ID until a free one is found
+# - Calls validate_container_id() to check availability
+# ------------------------------------------------------------------------------
+get_valid_container_id() {
+  local suggested_id="${1:-$(pvesh get /cluster/nextid)}"
+
+  while ! validate_container_id "$suggested_id"; do
+    suggested_id=$((suggested_id + 1))
+  done
+
+  echo "$suggested_id"
+}
+
+# ------------------------------------------------------------------------------
+# validate_container_id()
+#
+# - Validates if a container ID is available for use
+# - Checks if ID is already used by VM or LXC container
+# - Checks if ID is used in LVM logical volumes
+# - Returns 0 if ID is available, 1 if already in use
+# ------------------------------------------------------------------------------
+validate_container_id() {
+  local ctid="$1"
+
+  # Check if ID is numeric
+  if ! [[ "$ctid" =~ ^[0-9]+$ ]]; then
+    return 1
+  fi
+
+  # Check if config file exists for VM or LXC
+  if [[ -f "/etc/pve/qemu-server/${ctid}.conf" ]] || [[ -f "/etc/pve/lxc/${ctid}.conf" ]]; then
+    return 1
+  fi
+
+  # Check if ID is used in LVM logical volumes
+  if lvs --noheadings -o lv_name 2>/dev/null | grep -qE "(^|[-_])${ctid}($|[-_])"; then
+    return 1
+  fi
+
+  return 0
+}
+
+# ------------------------------------------------------------------------------
+# get_valid_container_id()
+#
+# - Returns a valid, unused container ID
+# - If provided ID is valid, returns it
+# - Otherwise increments from suggested ID until a free one is found
+# - Calls validate_container_id() to check availability
+# ------------------------------------------------------------------------------
+get_valid_container_id() {
+  local suggested_id="${1:-$(pvesh get /cluster/nextid)}"
+
+  while ! validate_container_id "$suggested_id"; do
+    suggested_id=$((suggested_id + 1))
+  done
+
+  echo "$suggested_id"
+}
+
 # ------------------------------------------------------------------------------
 # find_host_ssh_keys()
 #
@@ -417,6 +511,12 @@ choose_and_set_storage_for_file() {
   if [[ "$count" -eq 1 ]]; then
     STORAGE_RESULT=$(pvesm status -content "$content" | awk 'NR>1{print $1; exit}')
     STORAGE_INFO=""
+
+    # Validate storage space for auto-picked container storage
+    if [[ "$class" == "container" && -n "${DISK_SIZE:-}" ]]; then
+      validate_storage_space "$STORAGE_RESULT" "$DISK_SIZE" "yes"
+      # Continue even if validation fails - user was warned
+    fi
   else
     # If the current value is preselectable, we could show it, but per your requirement we always offer selection
     select_storage "$class" || return 1
@@ -483,7 +583,18 @@ base_settings() {
   RAM_SIZE="${final_ram}"
   VERBOSE=${var_verbose:-"${1:-no}"}
   PW=${var_pw:-""}
-  CT_ID=${var_ctid:-$NEXTID}
+
+  # Validate and set Container ID
+  local requested_id="${var_ctid:-$NEXTID}"
+  if ! validate_container_id "$requested_id"; then
+    # Only show warning if user manually specified an ID (not auto-assigned)
+    if [[ -n "${var_ctid:-}" ]]; then
+      msg_warn "Container ID $requested_id is already in use. Using next available ID: $(get_valid_container_id "$requested_id")"
+    fi
+    requested_id=$(get_valid_container_id "$requested_id")
+  fi
+  CT_ID="$requested_id"
+
   HN=${var_hostname:-$NSAPP}
   BRG=${var_brg:-"vmbr0"}
   NET=${var_net:-"dhcp"}
@@ -1098,6 +1209,13 @@ ensure_storage_selection_for_vars_file() {
   if [[ -n "$tpl" && -n "$ct" ]]; then
     TEMPLATE_STORAGE="$tpl"
     CONTAINER_STORAGE="$ct"
+
+    # Validate storage space for loaded container storage
+    if [[ -n "${DISK_SIZE:-}" ]]; then
+      validate_storage_space "$ct" "$DISK_SIZE" "yes"
+      # Continue even if validation fails - user was warned
+    fi
+
     return 0
   fi
 
@@ -1308,7 +1426,25 @@ advanced_settings() {
         --ok-button "Next" --cancel-button "Back" \
         --inputbox "\nSet Container ID" 10 58 "$_ct_id" \
         3>&1 1>&2 2>&3); then
-        _ct_id="${result:-$NEXTID}"
+        local input_id="${result:-$NEXTID}"
+
+        # Validate that ID is numeric
+        if ! [[ "$input_id" =~ ^[0-9]+$ ]]; then
+          whiptail --backtitle "Proxmox VE Helper Scripts" --title "Invalid ID" --msgbox "Container ID must be numeric." 8 58
+          continue
+        fi
+
+        # Check if ID is already in use
+        if ! validate_container_id "$input_id"; then
+          if whiptail --backtitle "Proxmox VE Helper Scripts" --title "ID Already In Use" \
+            --yesno "Container/VM ID $input_id is already in use.\n\nWould you like to use the next available ID ($(get_valid_container_id "$input_id"))?" 10 58; then
+            _ct_id=$(get_valid_container_id "$input_id")
+          else
+            continue
+          fi
+        else
+          _ct_id="$input_id"
+        fi
         ((STEP++))
       else
         ((STEP--))
@@ -2292,7 +2428,6 @@ install_script() {
     2 | advanced | ADVANCED)
       header_info
       echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Install on node $PVEHOST_NAME${CL}"
-      echo -e "${INFO}${BOLD}${DGN}PVE Version ${PVEVERSION} (Kernel: ${KERNEL_VERSION})${CL}"
       METHOD="advanced"
       base_settings
       advanced_settings
@@ -2853,6 +2988,21 @@ $PCT_OPTIONS_STRING"
   export TEMPLATE_STORAGE="${var_template_storage:-}"
   export CONTAINER_STORAGE="${var_container_storage:-}"
 
+  # Validate storage space only if CONTAINER_STORAGE is already set
+  # (Storage selection happens in create_lxc_container for some modes)
+  if [[ -n "$CONTAINER_STORAGE" ]]; then
+    msg_info "Validating storage space"
+    if ! validate_storage_space "$CONTAINER_STORAGE" "$DISK_SIZE" "no"; then
+      local free_space
+      free_space=$(pvesm status 2>/dev/null | awk -v s="$CONTAINER_STORAGE" '$1 == s { print $6 }')
+      local free_fmt
+      free_fmt=$(numfmt --to=iec --from-unit=1024 --suffix=B --format %.1f "$free_space" 2>/dev/null || echo "${free_space}KB")
+      msg_error "Not enough space on '$CONTAINER_STORAGE'. Required: ${DISK_SIZE}GB, Available: ${free_fmt}"
+      exit 214
+    fi
+    msg_ok "Storage space validated"
+  fi
+
   create_lxc_container || exit $?
 
   LXC_CONFIG="/etc/pve/lxc/${CTID}.conf"
@@ -3384,9 +3534,9 @@ resolve_storage_preselect() {
     free="$(awk '{print $6}' <<<"$line")"
     local total_h used_h free_h
     if command -v numfmt >/dev/null 2>&1; then
-      total_h="$(numfmt --to=iec --suffix=B --format %.1f "$total" 2>/dev/null || echo "$total")"
-      used_h="$(numfmt --to=iec --suffix=B --format %.1f "$used" 2>/dev/null || echo "$used")"
-      free_h="$(numfmt --to=iec --suffix=B --format %.1f "$free" 2>/dev/null || echo "$free")"
+      total_h="$(numfmt --to=iec --from-unit=1024 --suffix=B --format %.1f "$total" 2>/dev/null || echo "$total")"
+      used_h="$(numfmt --to=iec --from-unit=1024 --suffix=B --format %.1f "$used" 2>/dev/null || echo "$used")"
+      free_h="$(numfmt --to=iec --from-unit=1024 --suffix=B --format %.1f "$free" 2>/dev/null || echo "$free")"
       STORAGE_INFO="Free: ${free_h}  Used: ${used_h}"
     else
       STORAGE_INFO="Free: ${free}  Used: ${used}"
@@ -3502,8 +3652,8 @@ select_storage() {
   while read -r TAG TYPE _ TOTAL USED FREE _; do
     [[ -n "$TAG" && -n "$TYPE" ]] || continue
     local DISPLAY="${TAG} (${TYPE})"
-    local USED_FMT=$(numfmt --to=iec --from-unit=K --format %.1f <<<"$USED")
-    local FREE_FMT=$(numfmt --to=iec --from-unit=K --format %.1f <<<"$FREE")
+    local USED_FMT=$(numfmt --to=iec --from-unit=1024 --format %.1f <<<"$USED")
+    local FREE_FMT=$(numfmt --to=iec --from-unit=1024 --format %.1f <<<"$FREE")
     local INFO="Free: ${FREE_FMT}B  Used: ${USED_FMT}B"
     STORAGE_MAP["$DISPLAY"]="$TAG"
     MENU+=("$DISPLAY" "$INFO" "OFF")
@@ -3541,10 +3691,87 @@ select_storage() {
         break
       fi
     done
+
+    # Validate storage space for container storage
+    if [[ "$CLASS" == "container" && -n "${DISK_SIZE:-}" ]]; then
+      validate_storage_space "$STORAGE_RESULT" "$DISK_SIZE" "yes"
+      # Continue even if validation fails - user was warned
+    fi
+
     return 0
   done
 }
 
+# ------------------------------------------------------------------------------
+# validate_storage_space()
+#
+# - Validates if storage has enough free space for container
+# - Takes storage name and required size in GB
+# - Returns 0 if enough space, 1 if not enough, 2 if storage unavailable
+# - Can optionally show whiptail warning
+# - Handles all storage types: dir, lvm, lvmthin, zfs, nfs, cifs, etc.
+# ------------------------------------------------------------------------------
+validate_storage_space() {
+  local storage="$1"
+  local required_gb="${2:-8}"
+  local show_dialog="${3:-no}"
+
+  # Get full storage line from pvesm status
+  local storage_line
+  storage_line=$(pvesm status 2>/dev/null | awk -v s="$storage" '$1 == s {print $0}')
+
+  # Check if storage exists and is active
+  if [[ -z "$storage_line" ]]; then
+    [[ "$show_dialog" == "yes" ]] && whiptail --msgbox "⚠️  Warning: Storage '$storage' not found!\n\nThe storage may be unavailable or disabled." 10 60
+    return 2
+  fi
+
+  # Check storage status (column 3)
+  local status
+  status=$(awk '{print $3}' <<<"$storage_line")
+  if [[ "$status" == "disabled" ]]; then
+    [[ "$show_dialog" == "yes" ]] && whiptail --msgbox "⚠️  Warning: Storage '$storage' is disabled!\n\nPlease enable the storage first." 10 60
+    return 2
+  fi
+
+  # Get storage type and free space (column 6)
+  local storage_type storage_free
+  storage_type=$(awk '{print $2}' <<<"$storage_line")
+  storage_free=$(awk '{print $6}' <<<"$storage_line")
+
+  # Some storage types (like PBS, iSCSI) don't report size info
+  # In these cases, skip space validation
+  if [[ -z "$storage_free" || "$storage_free" == "0" ]]; then
+    # Silent pass for storages without size info
+    return 0
+  fi
+
+  local required_kb=$((required_gb * 1024 * 1024))
+  local free_gb_fmt
+  free_gb_fmt=$(numfmt --to=iec --from-unit=1024 --suffix=B --format %.1f "$storage_free" 2>/dev/null || echo "${storage_free}KB")
+
+  if [[ "$storage_free" -lt "$required_kb" ]]; then
+    if [[ "$show_dialog" == "yes" ]]; then
+      whiptail --msgbox "⚠️  Warning: Storage '$storage' may not have enough space!\n\nStorage Type: ${storage_type}\nRequired: ${required_gb}GB\nAvailable: ${free_gb_fmt}\n\nYou can continue, but creation might fail." 14 70
+    fi
+    return 1
+  fi
+
+  return 0
+}
+
+# ==============================================================================
+# SECTION 8: CONTAINER CREATION
+# ==============================================================================
+
+# ------------------------------------------------------------------------------
+# create_lxc_container()
+#
+# - Main function for creating LXC containers
+# - Handles all phases: validation, template discovery, container creation,
+#   network config, storage, etc.
+# - Extensive error checking with detailed exit codes
+# ------------------------------------------------------------------------------
 create_lxc_container() {
   # ------------------------------------------------------------------------------
   # Optional verbose mode (debug tracing)
@@ -3716,14 +3943,6 @@ create_lxc_container() {
   fi
   msg_ok "Template storage '$TEMPLATE_STORAGE' validated"
 
-  # Free space check
-  STORAGE_FREE=$(pvesm status | awk -v s="$CONTAINER_STORAGE" '$1 == s { print $6 }')
-  REQUIRED_KB=$((${PCT_DISK_SIZE:-8} * 1024 * 1024))
-  [[ "$STORAGE_FREE" -ge "$REQUIRED_KB" ]] || {
-    msg_error "Not enough space on '$CONTAINER_STORAGE'. Needed: ${PCT_DISK_SIZE:-8}G."
-    exit 214
-  }
-
   # Cluster quorum (if cluster)
   if [[ -f /etc/pve/corosync.conf ]]; then
     msg_info "Checking cluster quorum"

misc/tools.func

@@ -3576,6 +3576,11 @@ EOF
 setup_mariadb() {
   local MARIADB_VERSION="${MARIADB_VERSION:-latest}"
 
+  # Ensure non-interactive mode for all apt operations
+  export DEBIAN_FRONTEND=noninteractive
+  export NEEDRESTART_MODE=a
+  export NEEDRESTART_SUSPEND=1
+
   # Resolve "latest" to actual version
   if [[ "$MARIADB_VERSION" == "latest" ]]; then
     if ! curl -fsI --max-time 10 http://mirror.mariadb.org/repo/ >/dev/null 2>&1; then
@@ -3614,6 +3619,20 @@ setup_mariadb() {
   local CURRENT_VERSION=""
   CURRENT_VERSION=$(is_tool_installed "mariadb" 2>/dev/null) || true
 
+  # Pre-configure debconf to prevent any interactive prompts during install/upgrade
+  local MARIADB_MAJOR_MINOR
+  MARIADB_MAJOR_MINOR=$(echo "$MARIADB_VERSION" | awk -F. '{print $1"."$2}')
+  if [[ -n "$MARIADB_MAJOR_MINOR" ]]; then
+    debconf-set-selections <<EOF
+mariadb-server-$MARIADB_MAJOR_MINOR mariadb-server/feedback boolean false
+mariadb-server-$MARIADB_MAJOR_MINOR mariadb-server/root_password password
+mariadb-server-$MARIADB_MAJOR_MINOR mariadb-server/root_password_again password
+mariadb-server mariadb-server/feedback boolean false
+mariadb-server mariadb-server/root_password password
+mariadb-server mariadb-server/root_password_again password
+EOF
+  fi
+
   # Scenario 1: Already installed at target version - just update packages
   if [[ -n "$CURRENT_VERSION" && "$CURRENT_VERSION" == "$MARIADB_VERSION" ]]; then
     msg_info "Update MariaDB $MARIADB_VERSION"
@@ -3680,15 +3699,7 @@ setup_mariadb() {
     return 1
   }
 
-  # Set debconf selections for all potential versions
-  local MARIADB_MAJOR_MINOR
-  MARIADB_MAJOR_MINOR=$(echo "$MARIADB_VERSION" | awk -F. '{print $1"."$2}')
-  if [[ -n "$MARIADB_MAJOR_MINOR" ]]; then
-    echo "mariadb-server-$MARIADB_MAJOR_MINOR mariadb-server/feedback boolean false" | debconf-set-selections
-  fi
-
   # Install packages with retry logic
-  export DEBIAN_FRONTEND=noninteractive
   if ! install_packages_with_retry "mariadb-server" "mariadb-client"; then
     # Fallback: try without specific version
     msg_warn "Failed to install MariaDB packages from upstream repo, trying distro fallback..."
@@ -3828,6 +3839,11 @@ function setup_mongodb() {
   DISTRO_ID=$(get_os_info id)
   DISTRO_CODENAME=$(get_os_info codename)
 
+  # Ensure non-interactive mode for all apt operations
+  export DEBIAN_FRONTEND=noninteractive
+  export NEEDRESTART_MODE=a
+  export NEEDRESTART_SUSPEND=1
+
   # Check AVX support
   if ! grep -qm1 'avx[^ ]*' /proc/cpuinfo; then
     local major="${MONGO_VERSION%%.*}"
@@ -3946,6 +3962,11 @@ function setup_mysql() {
   DISTRO_ID=$(awk -F= '/^ID=/{print $2}' /etc/os-release | tr -d '"')
   DISTRO_CODENAME=$(awk -F= '/^VERSION_CODENAME=/{print $2}' /etc/os-release)
 
+  # Ensure non-interactive mode for all apt operations
+  export DEBIAN_FRONTEND=noninteractive
+  export NEEDRESTART_MODE=a
+  export NEEDRESTART_SUSPEND=1
+
   # Get currently installed version
   local CURRENT_VERSION=""
   CURRENT_VERSION=$(is_tool_installed "mysql" 2>/dev/null) || true
@@ -4040,7 +4061,6 @@ EOF
   ensure_apt_working || return 1
 
   # Try multiple package names with retry logic
-  export DEBIAN_FRONTEND=noninteractive
   local mysql_install_success=false
 
   if apt-cache search "^mysql-server$" 2>/dev/null | grep -q . &&
@@ -4479,6 +4499,11 @@ function setup_postgresql() {
   DISTRO_ID=$(awk -F= '/^ID=/{print $2}' /etc/os-release | tr -d '"')
   DISTRO_CODENAME=$(awk -F= '/^VERSION_CODENAME=/{print $2}' /etc/os-release)
 
+  # Ensure non-interactive mode for all apt operations
+  export DEBIAN_FRONTEND=noninteractive
+  export NEEDRESTART_MODE=a
+  export NEEDRESTART_SUSPEND=1
+
   # Get currently installed version
   local CURRENT_PG_VERSION=""
   if command -v psql >/dev/null; then
@@ -4936,6 +4961,11 @@ function setup_clickhouse() {
   DISTRO_ID=$(awk -F= '/^ID=/{print $2}' /etc/os-release | tr -d '"')
   DISTRO_CODENAME=$(awk -F= '/^VERSION_CODENAME=/{print $2}' /etc/os-release)
 
+  # Ensure non-interactive mode for all apt operations
+  export DEBIAN_FRONTEND=noninteractive
+  export NEEDRESTART_MODE=a
+  export NEEDRESTART_SUSPEND=1
+
   # Resolve "latest" version
   if [[ "$CLICKHOUSE_VERSION" == "latest" ]]; then
     CLICKHOUSE_VERSION=$(curl -fsSL --max-time 15 https://packages.clickhouse.com/tgz/stable/ 2>/dev/null |
@@ -4998,7 +5028,6 @@ function setup_clickhouse() {
     "main"
 
   # Install packages with retry logic
-  export DEBIAN_FRONTEND=noninteractive
   $STD apt update || {
     msg_error "APT update failed for ClickHouse repository"
     return 1

tools/addon/all-templates.sh

@@ -42,6 +42,29 @@ function msg() {
   local TEXT="$1"
   echo -e "$TEXT"
 }
+function validate_container_id() {
+  local ctid="$1"
+  # Check if ID is numeric
+  if ! [[ "$ctid" =~ ^[0-9]+$ ]]; then
+    return 1
+  fi
+  # Check if config file exists for VM or LXC
+  if [[ -f "/etc/pve/qemu-server/${ctid}.conf" ]] || [[ -f "/etc/pve/lxc/${ctid}.conf" ]]; then
+    return 1
+  fi
+  # Check if ID is used in LVM logical volumes
+  if lvs --noheadings -o lv_name 2>/dev/null | grep -qE "(^|[-_])${ctid}($|[-_])"; then
+    return 1
+  fi
+  return 0
+}
+function get_valid_container_id() {
+  local suggested_id="${1:-$(pvesh get /cluster/nextid)}"
+  while ! validate_container_id "$suggested_id"; do
+    suggested_id=$((suggested_id + 1))
+  done
+  echo "$suggested_id"
+}
 function cleanup_ctid() {
   if pct status $CTID &>/dev/null; then
     if [ "$(pct status $CTID | awk '{print $2}')" == "running" ]; then
@@ -76,7 +99,15 @@ TEMPLATE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "All Templat
 # Setup script environment
 NAME=$(echo "$TEMPLATE" | grep -oE '^[^-]+-[^-]+')
 PASS="$(openssl rand -base64 8)"
+
+# Get valid Container ID
 CTID=$(pvesh get /cluster/nextid)
+if ! validate_container_id "$CTID"; then
+  warn "Container ID $CTID is already in use."
+  CTID=$(get_valid_container_id "$CTID")
+  info "Using next available ID: $CTID"
+fi
+
 PCT_OPTIONS="
     -features keyctl=1,nesting=1
     -hostname $NAME

tools/addon/jellystat.sh

@@ -0,0 +1,369 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: MickLesk (CanbiZ)
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/CyferShepard/Jellystat
+
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
+
+# Enable error handling
+set -Eeuo pipefail
+trap 'error_handler' ERR
+
+# ==============================================================================
+# CONFIGURATION
+# ==============================================================================
+APP="Jellystat"
+APP_TYPE="addon"
+INSTALL_PATH="/opt/jellystat"
+CONFIG_PATH="/opt/jellystat/.env"
+DEFAULT_PORT=3000
+
+# Initialize all core functions (colors, formatting, icons, STD mode)
+load_functions
+
+# ==============================================================================
+# HEADER
+# ==============================================================================
+function header_info {
+  clear
+  cat <<"EOF"
+       __     ____           __        __
+      / /__  / / /_  _______/ /_____ _/ /_
+ __  / / _ \/ / / / / / ___/ __/ __ `/ __/
+/ /_/ /  __/ / / /_/ (__  ) /_/ /_/ / /_
+\____/\___/_/_/\__, /____/\__/\__,_/\__/
+              /____/
+EOF
+}
+
+# ==============================================================================
+# OS DETECTION
+# ==============================================================================
+if [[ -f "/etc/alpine-release" ]]; then
+  msg_error "Alpine is not supported for ${APP}. Use Debian/Ubuntu."
+  exit 1
+elif [[ -f "/etc/debian_version" ]]; then
+  OS="Debian"
+  SERVICE_PATH="/etc/systemd/system/jellystat.service"
+else
+  echo -e "${CROSS} Unsupported OS detected. Exiting."
+  exit 1
+fi
+
+# ==============================================================================
+# UNINSTALL
+# ==============================================================================
+function uninstall() {
+  msg_info "Uninstalling ${APP}"
+  systemctl disable --now jellystat.service &>/dev/null || true
+  rm -f "$SERVICE_PATH"
+  rm -rf "$INSTALL_PATH"
+  rm -f "/usr/local/bin/update_jellystat"
+  rm -f "$HOME/.jellystat"
+  msg_ok "${APP} has been uninstalled"
+
+  # Ask about PostgreSQL database removal
+  echo ""
+  echo -n "${TAB}Also remove PostgreSQL database 'jellystat'? (y/N): "
+  read -r db_prompt
+  if [[ "${db_prompt,,}" =~ ^(y|yes)$ ]]; then
+    if command -v psql &>/dev/null; then
+      msg_info "Removing PostgreSQL database and user"
+      $STD sudo -u postgres psql -c "DROP DATABASE IF EXISTS jellystat;" &>/dev/null || true
+      $STD sudo -u postgres psql -c "DROP USER IF EXISTS jellystat;" &>/dev/null || true
+      msg_ok "Removed PostgreSQL database 'jellystat' and user 'jellystat'"
+    else
+      msg_warn "PostgreSQL not found - database may have been removed already"
+    fi
+  else
+    msg_warn "PostgreSQL database was NOT removed. Remove manually if needed:"
+    echo -e "${TAB}  sudo -u postgres psql -c \"DROP DATABASE jellystat;\""
+    echo -e "${TAB}  sudo -u postgres psql -c \"DROP USER jellystat;\""
+  fi
+}
+
+# ==============================================================================
+# UPDATE
+# ==============================================================================
+function update() {
+  if check_for_gh_release "jellystat" "CyferShepard/Jellystat"; then
+    msg_info "Stopping service"
+    systemctl stop jellystat.service &>/dev/null || true
+    msg_ok "Stopped service"
+
+    msg_info "Backing up configuration"
+    cp "$CONFIG_PATH" /tmp/jellystat.env.bak 2>/dev/null || true
+    msg_ok "Backed up configuration"
+
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jellystat" "CyferShepard/Jellystat" "tarball" "latest" "$INSTALL_PATH"
+
+    msg_info "Restoring configuration"
+    cp /tmp/jellystat.env.bak "$CONFIG_PATH" 2>/dev/null || true
+    rm -f /tmp/jellystat.env.bak
+    msg_ok "Restored configuration"
+
+    msg_info "Installing dependencies"
+    cd "$INSTALL_PATH"
+    $STD npm install
+    msg_ok "Installed dependencies"
+
+    msg_info "Building ${APP}"
+    $STD npm run build
+    msg_ok "Built ${APP}"
+
+    msg_info "Starting service"
+    systemctl start jellystat
+    msg_ok "Started service"
+    msg_ok "Updated successfully"
+    exit
+  fi
+}
+
+# ==============================================================================
+# INSTALL
+# ==============================================================================
+function install() {
+  # Setup Node.js (only installs if not present or different version)
+  if command -v node &>/dev/null; then
+    msg_ok "Node.js already installed ($(node -v))"
+  else
+    NODE_VERSION="22" setup_nodejs
+  fi
+
+  # Setup PostgreSQL (only installs if not present)
+  if command -v psql &>/dev/null; then
+    msg_ok "PostgreSQL already installed"
+  else
+    PG_VERSION="17" setup_postgresql
+  fi
+
+  # Create database and user (skip if already exists)
+  local DB_NAME="jellystat"
+  local DB_USER="jellystat"
+  local DB_PASS
+
+  msg_info "Setting up PostgreSQL database"
+
+  # Check if database already exists
+  if sudo -u postgres psql -lqt 2>/dev/null | cut -d \| -f 1 | grep -qw "$DB_NAME"; then
+    msg_warn "Database '${DB_NAME}' already exists - skipping creation"
+    echo -n "${TAB}Enter existing database password for '${DB_USER}': "
+    read -rs DB_PASS
+    echo ""
+  else
+    # Generate new password
+    DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c16)
+
+    # Check if user exists, create if not
+    if sudo -u postgres psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='${DB_USER}'" 2>/dev/null | grep -q 1; then
+      msg_info "User '${DB_USER}' exists, updating password"
+      $STD sudo -u postgres psql -c "ALTER USER ${DB_USER} WITH PASSWORD '${DB_PASS}';" || {
+        msg_error "Failed to update PostgreSQL user"
+        return 1
+      }
+    else
+      $STD sudo -u postgres psql -c "CREATE USER ${DB_USER} WITH PASSWORD '${DB_PASS}';" || {
+        msg_error "Failed to create PostgreSQL user"
+        return 1
+      }
+    fi
+
+    # Create database (use template0 for UTF8 encoding compatibility)
+    $STD sudo -u postgres psql -c "CREATE DATABASE ${DB_NAME} WITH OWNER ${DB_USER} ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' TEMPLATE template0;" || {
+      msg_error "Failed to create PostgreSQL database"
+      return 1
+    }
+    $STD sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE ${DB_NAME} TO ${DB_USER};" || {
+      msg_error "Failed to grant privileges"
+      return 1
+    }
+
+    # Grant schema permissions (required for PostgreSQL 15+)
+    $STD sudo -u postgres psql -d "${DB_NAME}" -c "GRANT ALL ON SCHEMA public TO ${DB_USER};" || true
+
+    # Configure pg_hba.conf for password authentication on localhost
+    local PG_HBA
+    PG_HBA=$(sudo -u postgres psql -tAc "SHOW hba_file;" 2>/dev/null | tr -d ' ')
+    if [[ -n "$PG_HBA" && -f "$PG_HBA" ]]; then
+      # Check if md5/scram-sha-256 auth is already configured for local connections
+      if ! grep -qE "^host\s+${DB_NAME}\s+${DB_USER}\s+127.0.0.1" "$PG_HBA"; then
+        msg_info "Configuring PostgreSQL authentication"
+        # Add password auth for jellystat user on localhost (before the default rules)
+        sed -i "/^# IPv4 local connections:/a host    ${DB_NAME}    ${DB_USER}    127.0.0.1/32    scram-sha-256" "$PG_HBA"
+        sed -i "/^# IPv4 local connections:/a host    ${DB_NAME}    ${DB_USER}    ::1/128         scram-sha-256" "$PG_HBA"
+        # Reload PostgreSQL to apply changes
+        systemctl reload postgresql
+        msg_ok "Configured PostgreSQL authentication"
+      fi
+    fi
+
+    msg_ok "Created PostgreSQL database '${DB_NAME}'"
+  fi
+
+  # Generate JWT Secret
+  local JWT_SECRET
+  JWT_SECRET=$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | head -c32)
+
+  # Force fresh download by removing version cache
+  rm -f "$HOME/.jellystat"
+  fetch_and_deploy_gh_release "jellystat" "CyferShepard/Jellystat" "tarball" "latest" "$INSTALL_PATH"
+
+  msg_info "Installing dependencies"
+  cd "$INSTALL_PATH"
+  $STD npm install
+  msg_ok "Installed dependencies"
+
+  msg_info "Building ${APP}"
+  $STD npm run build
+  msg_ok "Built ${APP}"
+
+  msg_info "Creating configuration"
+  cat <<EOF >"$CONFIG_PATH"
+# Jellystat Configuration
+# Database
+POSTGRES_USER=${DB_USER}
+POSTGRES_PASSWORD=${DB_PASS}
+POSTGRES_IP=localhost
+POSTGRES_PORT=5432
+POSTGRES_DB=${DB_NAME}
+
+# Security
+JWT_SECRET=${JWT_SECRET}
+
+# Server
+JS_LISTEN_IP=0.0.0.0
+JS_BASE_URL=/
+TZ=$(cat /etc/timezone 2>/dev/null || echo "UTC")
+
+# Optional: GeoLite for IP Geolocation
+# JS_GEOLITE_ACCOUNT_ID=
+# JS_GEOLITE_LICENSE_KEY=
+
+# Optional: Master Override (if you forget your password)
+# JS_USER=admin
+# JS_PASSWORD=admin
+
+# Optional: Minimum playback duration to record (seconds)
+# MINIMUM_SECONDS_TO_INCLUDE_PLAYBACK=1
+
+# Optional: Self-signed certificates
+REJECT_SELF_SIGNED_CERTIFICATES=true
+EOF
+  chmod 600 "$CONFIG_PATH"
+  msg_ok "Created configuration"
+
+  msg_info "Creating service"
+  cat <<EOF >"$SERVICE_PATH"
+[Unit]
+Description=Jellystat - Statistics for Jellyfin
+After=network.target postgresql.service
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=${INSTALL_PATH}
+EnvironmentFile=${CONFIG_PATH}
+ExecStart=/usr/bin/node ${INSTALL_PATH}/backend/server.js
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
+EOF
+  systemctl enable --now jellystat &>/dev/null
+  msg_ok "Created and started service"
+
+  # Create update script (simple wrapper that calls this addon with type=update)
+  msg_info "Creating update script"
+  cat <<'UPDATEEOF' >/usr/local/bin/update_jellystat
+#!/usr/bin/env bash
+# Jellystat Update Script
+type=update bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/addon/jellystat.sh)"
+UPDATEEOF
+  chmod +x /usr/local/bin/update_jellystat
+  msg_ok "Created update script (/usr/local/bin/update_jellystat)"
+
+  # Save credentials
+  local CREDS_FILE="/root/jellystat.creds"
+  cat <<EOF >"$CREDS_FILE"
+Jellystat Credentials
+=====================
+Database User: ${DB_USER}
+Database Password: ${DB_PASS}
+Database Name: ${DB_NAME}
+JWT Secret: ${JWT_SECRET}
+
+Web UI: http://${LOCAL_IP}:${DEFAULT_PORT}
+EOF
+  chmod 600 "$CREDS_FILE"
+
+  echo ""
+  msg_ok "${APP} is reachable at: ${BL}http://${LOCAL_IP}:${DEFAULT_PORT}${CL}"
+  msg_ok "Credentials saved to: ${BL}${CREDS_FILE}${CL}"
+  echo ""
+  msg_warn "On first access, you'll need to configure your Jellyfin server connection."
+}
+
+# ==============================================================================
+# MAIN
+# ==============================================================================
+
+# Handle type=update (called from update script)
+if [[ "${type:-}" == "update" ]]; then
+  header_info
+  if [[ -d "$INSTALL_PATH" && -f "$INSTALL_PATH/package.json" ]]; then
+    update
+  else
+    msg_error "${APP} is not installed. Nothing to update."
+    exit 1
+  fi
+  exit 0
+fi
+
+header_info
+import_local_ip
+
+# Check if already installed
+if [[ -d "$INSTALL_PATH" && -f "$INSTALL_PATH/package.json" ]]; then
+  msg_warn "${APP} is already installed."
+  echo ""
+
+  echo -n "${TAB}Uninstall ${APP}? (y/N): "
+  read -r uninstall_prompt
+  if [[ "${uninstall_prompt,,}" =~ ^(y|yes)$ ]]; then
+    uninstall
+    exit 0
+  fi
+
+  echo -n "${TAB}Update ${APP}? (y/N): "
+  read -r update_prompt
+  if [[ "${update_prompt,,}" =~ ^(y|yes)$ ]]; then
+    update
+    exit 0
+  fi
+
+  msg_warn "No action selected. Exiting."
+  exit 0
+fi
+
+# Fresh installation
+msg_warn "${APP} is not installed."
+echo ""
+echo -e "${TAB}${INFO} This will install:"
+echo -e "${TAB}  - Node.js 22"
+echo -e "${TAB}  - PostgreSQL 17"
+echo -e "${TAB}  - Jellystat"
+echo ""
+
+echo -n "${TAB}Install ${APP}? (y/N): "
+read -r install_prompt
+if [[ "${install_prompt,,}" =~ ^(y|yes)$ ]]; then
+  install
+else
+  msg_warn "Installation cancelled. Exiting."
+  exit 0
+fi

tools/headers/jellystat

@@ -0,0 +1,6 @@
+       __     ____           __        __ 
+      / /__  / / /_  _______/ /_____ _/ /_
+ __  / / _ \/ / / / / / ___/ __/ __ `/ __/
+/ /_/ /  __/ / / /_/ (__  ) /_/ /_/ / /_  
+\____/\___/_/_/\__, /____/\__/\__,_/\__/  
+              /____/                      

turnkey/turnkey.sh

@@ -42,6 +42,29 @@ function msg() {
   local TEXT="$1"
   echo -e "$TEXT"
 }
+function validate_container_id() {
+  local ctid="$1"
+  # Check if ID is numeric
+  if ! [[ "$ctid" =~ ^[0-9]+$ ]]; then
+    return 1
+  fi
+  # Check if config file exists for VM or LXC
+  if [[ -f "/etc/pve/qemu-server/${ctid}.conf" ]] || [[ -f "/etc/pve/lxc/${ctid}.conf" ]]; then
+    return 1
+  fi
+  # Check if ID is used in LVM logical volumes
+  if lvs --noheadings -o lv_name 2>/dev/null | grep -qE "(^|[-_])${ctid}($|[-_])"; then
+    return 1
+  fi
+  return 0
+}
+function get_valid_container_id() {
+  local suggested_id="${1:-$(pvesh get /cluster/nextid)}"
+  while ! validate_container_id "$suggested_id"; do
+    suggested_id=$((suggested_id + 1))
+  done
+  echo "$suggested_id"
+}
 function cleanup_ctid() {
   if pct status $CTID &>/dev/null; then
     if [ "$(pct status $CTID | awk '{print $2}')" == "running" ]; then
@@ -99,9 +122,26 @@ turnkey=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "TurnKey LXCs
 # Setup script environment
 PASS="$(openssl rand -base64 8)"
 # Prompt user to confirm container ID
-  CTID=$(whiptail --backtitle "Container ID" --title "Choose the Container ID" --inputbox "Enter the conatiner ID..." 8 40 $(pvesh get /cluster/nextid) 3>&1 1>&2 2>&3)
+while true; do
+  CTID=$(whiptail --backtitle "Container ID" --title "Choose the Container ID" --inputbox "Enter the container ID..." 8 40 $(pvesh get /cluster/nextid) 3>&1 1>&2 2>&3)
+
+  # Check if user cancelled
+  [ -z "$CTID" ] && die "No Container ID selected"
+
+  # Validate Container ID
+  if ! validate_container_id "$CTID"; then
+    SUGGESTED_ID=$(get_valid_container_id "$CTID")
+    if whiptail --backtitle "Container ID" --title "ID Already In Use" --yesno "Container/VM ID $CTID is already in use.\n\nWould you like to use the next available ID ($SUGGESTED_ID)?" 10 58; then
+      CTID="$SUGGESTED_ID"
+      break
+    fi
+    # User declined, loop back to input
+  else
+    break
+  fi
+done
 # Prompt user to confirm Hostname
-  HOST_NAME=$(whiptail --backtitle "Hostname" --title "Choose the Hostname" --inputbox "Enter the containers Hostname..." 8 40 "turnkey-${turnkey}" 3>&1 1>&2 2>&3)
+HOST_NAME=$(whiptail --backtitle "Hostname" --title "Choose the Hostname" --inputbox "Enter the containers Hostname..." 8 40 "turnkey-${turnkey}" 3>&1 1>&2 2>&3)
 PCT_OPTIONS="
     -features keyctl=1,nesting=1
     -hostname $HOST_NAME
@@ -206,8 +246,8 @@ echo "TurnKey ${turnkey} password: ${PASS}" >>~/turnkey-${turnkey}.creds # file
 TUN_DEVICE_REQUIRED=("openvpn") # Setup this way in case future turnkeys also need tun access
 if printf '%s\n' "${TUN_DEVICE_REQUIRED[@]}" | grep -qw "${turnkey}"; then
   info "${turnkey} requires access to /dev/net/tun on the host. Modifying the container configuration to allow this."
-  echo "lxc.cgroup2.devices.allow: c 10:200 rwm" >> /etc/pve/lxc/${CTID}.conf
-  echo "lxc.mount.entry: /dev/net/tun dev/net/tun none bind,create=file 0 0" >> /etc/pve/lxc/${CTID}.conf
+  echo "lxc.cgroup2.devices.allow: c 10:200 rwm" >>/etc/pve/lxc/${CTID}.conf
+  echo "lxc.mount.entry: /dev/net/tun dev/net/tun none bind,create=file 0 0" >>/etc/pve/lxc/${CTID}.conf
   sleep 5
 fi