Add victorialogs (ct)

CHANGELOG.md

@@ -572,19 +572,7 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
 ### 🆕 New Scripts
 
-  - VictoriaLogs ([#18282](https://github.com/community-scripts/ProxmoxVE/pull/18282))
-- Deemix ([#18272](https://github.com/community-scripts/ProxmoxVE/pull/18272))
-
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - apache-tomcat: restore the update backup from its real store [@mazelado](https://github.com/mazelado) ([#18145](https://github.com/community-scripts/ProxmoxVE/pull/18145))
-    - AdventureLog: clean-install on update and drop the DRF <3.15 pin [@angusmaul](https://github.com/angusmaul) ([#18281](https://github.com/community-scripts/ProxmoxVE/pull/18281))
-
-### 💾 Core
-
-  - Keep the console hint out of the default output [@MickLesk](https://github.com/MickLesk) ([core#176](https://github.com/community-scripts/core/pull/176))
+  - Deemix ([#18272](https://github.com/community-scripts/ProxmoxVE/pull/18272))
 
 ### 📚 Documentation
 

ct/adventurelog.sh

@@ -37,9 +37,9 @@ function update_script() {
     msg_ok "Services Stopped"
 
     create_backup /opt/adventurelog/backend/server/.env \
-      /opt/adventurelog/frontend/.env
+      /opt/adventurelog/backend/server/media
 
-    CLEAN_INSTALL=1 CLEAN_INSTALL_KEEP="backend/server/media" fetch_and_deploy_gh_release "adventurelog" "seanmorley15/adventurelog" "tarball"
+    fetch_and_deploy_gh_release "adventurelog" "seanmorley15/adventurelog" "tarball"
     PYTHON_VERSION="3.13" setup_uv
 
     msg_info "Ensuring PostgreSQL Extensions"
@@ -56,6 +56,7 @@ function update_script() {
     fi
     $STD .venv/bin/python -m pip install --upgrade pip
     $STD .venv/bin/python -m pip install -r requirements.txt
+    $STD .venv/bin/python -m pip install 'djangorestframework<3.15'
     $STD .venv/bin/python -m manage collectstatic --noinput
     $STD .venv/bin/python -m manage migrate
 

ct/apache-tomcat.sh

@@ -51,28 +51,18 @@ function update_script() {
     exit
   fi
 
-  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}"
-
-  # Keep only the jars in lib that the new release does not ship (JDBC drivers
-  # and the like). ecj and jakartaee-migration are Tomcat's own and change name
-  # with each version, so they are never carried over.
-  TOMCAT_FILES=$(tar -tzf /tmp/tomcat-update.tar.gz)
-  BACKUP_PATHS=("$TOMCAT_DIR/conf")
-  [[ -d $TOMCAT_DIR/webapps ]] && BACKUP_PATHS+=("$TOMCAT_DIR/webapps")
-  for jar in "$TOMCAT_DIR"/lib/*.jar; do
-    [[ -f $jar ]] || continue
-    case "${jar##*/}" in ecj-*.jar | jakartaee-migration-*.jar) continue ;; esac
-    grep -qxF "apache-tomcat-${LATEST_VERSION}/lib/${jar##*/}" <<<"$TOMCAT_FILES" || BACKUP_PATHS+=("$jar")
-  done
-
   msg_info "Stopping Tomcat service"
   systemctl stop tomcat
   msg_ok "Stopped Tomcat service"
 
-  create_backup "${BACKUP_PATHS[@]}"
+  create_backup $TOMCAT_DIR/conf
+  [[ -d $TOMCAT_DIR/webapps ]] && create_backup $TOMCAT_DIR/webapps
+  [[ -d $TOMCAT_DIR/lib ]] && create_backup $TOMCAT_DIR/lib
+
+  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:?}"/*
@@ -80,8 +70,21 @@ function update_script() {
   rm -f /tmp/tomcat-update.tar.gz
   msg_ok "Installed update"
 
-  restore_backup
+  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

ct/tdarr.sh

@@ -10,7 +10,7 @@ APP="Tdarr"
 var_tags="${var_tags:-arr}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
-var_disk="${var_disk:-15}"
+var_disk="${var_disk:-4}"
 var_os="${var_os:-debian}"
 var_version="${var_version:-13}"
 var_arm64="${var_arm64:-yes}"

install/adventurelog-install.sh

@@ -62,6 +62,7 @@ $STD uv venv --clear /opt/adventurelog/backend/server/.venv
 $STD /opt/adventurelog/backend/server/.venv/bin/python -m ensurepip --upgrade
 $STD /opt/adventurelog/backend/server/.venv/bin/python -m pip install --upgrade pip
 $STD /opt/adventurelog/backend/server/.venv/bin/python -m pip install -r requirements.txt
+$STD /opt/adventurelog/backend/server/.venv/bin/python -m pip install 'djangorestframework<3.15'
 $STD /opt/adventurelog/backend/server/.venv/bin/python -m manage collectstatic --noinput
 $STD /opt/adventurelog/backend/server/.venv/bin/python -m manage migrate
 $STD /opt/adventurelog/backend/server/.venv/bin/python -m manage download-countries

vm/opnsense-vm.sh

@@ -432,17 +432,17 @@ set_description
 
 msg_info "Bridge interfaces are being added."
 qm set $VMID \
-  -net0 virtio,bridge=${BRG},macaddr=${MAC},firewall=0,queues=${CORE_COUNT}${VLAN}${MTU} >/dev/null
+  -net0 virtio,bridge=${BRG},macaddr=${MAC},firewall=0,queues=${CORE_COUNT}${VLAN}${MTU} 2>/dev/null
 if [ -n "$WAN_BRG" ]; then
   qm set $VMID \
-    -net1 virtio,bridge=${WAN_BRG},macaddr=${WAN_MAC},firewall=0,queues=${CORE_COUNT} >/dev/null
+    -net1 virtio,bridge=${WAN_BRG},macaddr=${WAN_MAC},firewall=0,queues=${CORE_COUNT} 2>/dev/null
 fi
 msg_ok "Bridge interfaces have been successfully added."
 
 msg_ok "Created a OPNsense VM ${CL}${BL}(${HN})"
 msg_ok "Starting OPNsense VM (the bootstrap takes 10-30 minutes)"
 $STD qm start $VMID
-sleep 180
+sleep 90
 send_line_to_vm "root"
 sleep 2
 send_line_to_vm ""