Merge remote-tracking branch 'upstream/main'

2025-01-19 11:27:48 +10:00
parent e6c4a75ea1 f8f166e26f
commit 4ee135aa87
17 changed files with 86 additions and 47 deletions
--- a/.github/workflows/update_json_date.yml.bak
+++ b/.github/workflows/update_json_date.yml.bak
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,24 @@ All LXC instances created using this repository come pre-installed with Midnight
 > [!IMPORTANT]
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow

+
+## 2025-01-18
+
+### Changed
+
+### 💥 Breaking Changes
+
+- **READ GUIDE FIRST** breaking change: Homeassistant-Core upgrade os and python3 [@MickLesk](https://github.com/MickLesk) ([#1550](https://github.com/community-scripts/ProxmoxVE/pull/1550))
+- Update Openwrt: Delete lines that do WAN input and forward accept [@chackl1990](https://github.com/chackl1990) ([#1540](https://github.com/community-scripts/ProxmoxVE/pull/1540))
+
+### 🚀 Updated Scripts
+
+- added cifs support in ubuntu2404-vm.sh [@plonxyz](https://github.com/plonxyz) ([#1461](https://github.com/community-scripts/ProxmoxVE/pull/1461))
+- Fix linkwarden update [@burgerga](https://github.com/burgerga) ([#1565](https://github.com/community-scripts/ProxmoxVE/pull/1565))
+- [jellyseerr] Update nodejs if not up-to-date [@makstech](https://github.com/makstech) ([#1563](https://github.com/community-scripts/ProxmoxVE/pull/1563))
+- Update VM Tags [@oOStroudyOo](https://github.com/oOStroudyOo) ([#1562](https://github.com/community-scripts/ProxmoxVE/pull/1562))
+- Update apt-cacher-ng.sh: Typo/Missing $ [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1545](https://github.com/community-scripts/ProxmoxVE/pull/1545))
+
 ## 2025-01-16

 ### Changed
--- a/ct/apt-cacher-ng.sh
+++ b/ct/apt-cacher-ng.sh
@@ -46,4 +46,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}:3142/acng-report.html{CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3142/acng-report.html${CL}"
--- a/ct/homeassistant-core.sh
+++ b/ct/homeassistant-core.sh
@@ -9,10 +9,10 @@ source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/b
 APP="Home Assistant-Core"
 var_tags="automation;smarthome"
 var_cpu="2"
-var_ram="1024"
-var_disk="8"
+var_ram="2048"
+var_disk="10"
 var_os="ubuntu"
-var_version="24.04"
+var_version="24.10"
 var_unprivileged="1"

 # App Output & Base Settings
@@ -26,6 +26,13 @@ catch_errors

 function update_script() {
  header_info
+
+  # OS Check
+  if ! lsb_release -d | grep -q "Ubuntu 24.10"; then
+    msg_error "Wrong OS detected. This script only supports Ubuntu 24.10."
+    msg_error "Read Guide: https://github.com/community-scripts/ProxmoxVE/discussions/1549"
+    exit 1
+  fi
  check_container_storage
  check_container_resources
  if [[ ! -d /srv/homeassistant ]]; then
@@ -51,17 +58,13 @@ function update_script() {
      echo -e "${GN}Updating to Stable Version${CL}"
      BR=""
    fi
-    if [[ "$PY" =~ ^python3\.(11|12)\.[0-9]+$ ]]; then
-    echo -e "⚠️  Home Assistant will soon require Python 3.13.x";
-    fi
-
    msg_info "Stopping Home Assistant"
    systemctl stop homeassistant
    msg_ok "Stopped Home Assistant"

    msg_info "Updating Home Assistant"
    source /srv/homeassistant/bin/activate
-    uv pip install ${BR}--upgrade homeassistant &>/dev/null
+    pip install ${BR}--upgrade homeassistant &>/dev/null
    msg_ok "Updated Home Assistant"

    msg_info "Starting Home Assistant"
@@ -75,7 +78,7 @@ function update_script() {
  if [ "$UPD" == "2" ]; then
    msg_info "Installing Home Assistant Community Store (HACS)"
    apt update &>/dev/null
-    apt install unzip &>/dev/null
+    apt install -y unzip &>/dev/null
    cd .homeassistant
    bash <(curl -fsSL https://get.hacs.xyz) &>/dev/null
    msg_ok "Installed Home Assistant Community Store (HACS)"
@@ -102,16 +105,19 @@ function update_script() {
    msg_ok "Installed FileBrowser"

    msg_info "Creating Service"
-    service_path="/etc/systemd/system/filebrowser.service"
-    echo "[Unit]
+    cat <<EOF > /etc/systemd/system/filebrowser.service
+[Unit]
 Description=Filebrowser
 After=network-online.target
+
 [Service]
 User=root
 WorkingDirectory=/root/
 ExecStart=/usr/local/bin/filebrowser -r /root/.homeassistant
+
 [Install]
-WantedBy=default.target" >$service_path
+WantedBy=default.target
+EOF

    systemctl enable --now -q filebrowser.service
    msg_ok "Created Service"
@@ -130,4 +136,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}:8123${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8123${CL}"
--- a/ct/jellyseerr.sh
+++ b/ct/jellyseerr.sh
@@ -34,6 +34,22 @@ function update_script() {
        exit
    fi

+    if [ "$(node -v | cut -c2-3)" -ne 22 ]; then
+        msg_info "Updating Node.js Repository"
+        echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
+        msg_ok "Updating Node.js Repository"
+
+        msg_info "Updating Packages"
+        apt-get update &>/dev/null
+        apt-get -y upgrade &>/dev/null
+        msg_ok "Updating Packages"
+        
+        msg_info "Cleaning up"
+        apt-get -y autoremove
+        apt-get -y autoclean
+        msg_ok "Cleaning up"
+    fi
+
    if ! command -v pnpm &> /dev/null; then
        msg_error "pnpm not found. Installing..."
        npm install -g pnpm &>/dev/null
--- a/ct/linkwarden.sh
+++ b/ct/linkwarden.sh
@@ -40,6 +40,7 @@ function update_script() {
    msg_info "Updating ${APP} to ${RELEASE}"
    cd /opt
    mv /opt/linkwarden/.env /opt/.env
+    rm -rf /opt/linkwarden
    RELEASE=$(curl -s https://api.github.com/repos/linkwarden/linkwarden/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
    wget -q "https://github.com/linkwarden/linkwarden/archive/refs/tags/${RELEASE}.zip"
    unzip -q ${RELEASE}.zip
@@ -59,7 +60,6 @@ function update_script() {
    msg_ok "Started ${APP}"
    msg_info "Cleaning up"
    rm -rf /opt/${RELEASE}.zip
-    rm -rf /opt/linkwarden_bak
    msg_ok "Cleaned"
    msg_ok "Updated Successfully"
  else
@@ -75,4 +75,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}:3000${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"
--- a/install/homeassistant-core-install.sh
+++ b/install/homeassistant-core-install.sh
@@ -45,36 +45,37 @@ $STD apt-get install -y \
  libmariadb-dev-compat \
  libatlas-base-dev \
  software-properties-common \
+  libmariadb-dev \
+  pkg-config \
  wget \
  openssh-server
 msg_ok "Installed Dependencies"

-msg_info "Setup Python3"
-$STD add-apt-repository -y ppa:deadsnakes/ppa
+msg_info "Setup Python3/pip"
 $STD apt-get update
+$STD rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
+$STD apt-get remove --purge -y python3.12 python3.12-dev python3.12-venv
+
 $STD apt-get install -y \
-  python3.13-* \
+  python3.13 \
  python3-pip \
  python3.13-dev \
  python3.13-venv
 rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
+ln -sf /usr/bin/python3.13 /usr/bin/python3
 msg_ok "Setup Python3"

-msg_info "Installing UV"
-$STD pip install uv
-msg_ok "Installed UV"
-
 msg_info "Setting up Home Assistant-Core environment"
 mkdir /srv/homeassistant
 cd /srv/homeassistant
-uv venv . &>/dev/null
+python3 -m venv .
 source bin/activate
-msg_ok "Created virtual environment with UV"
+msg_ok "Created virtual environment"

-msg_info "Installing Home Assistant-Core and packages"
-$STD uv pip install webrtcvad wheel homeassistant mysqlclient psycopg2-binary isal
+msg_info "Installing Home Assistant-Core"
+$STD python3 -m pip install webrtcvad wheel homeassistant mysqlclient psycopg2-binary isal
 mkdir -p /root/.homeassistant
-msg_ok "Installed Home Assistant-Core and required packages"
+msg_ok "Installed Home Assistant-Core"

 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/homeassistant.service
@@ -100,4 +101,4 @@ customize
 msg_info "Cleaning up"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
-msg_ok "Cleaned"
+msg_ok "Cleaned"
--- a/json/homeassistant-core.json
+++ b/json/homeassistant-core.json
@@ -4,7 +4,7 @@
    "categories": [
        2
    ],
-    "date_created": "2024-04-29",
+    "date_created": "2025-01-17",
    "type": "ct",
    "updateable": true,
    "privileged": false,
@@ -19,10 +19,10 @@
            "script": "ct/homeassistant-core.sh",
            "resources": {
                "cpu": 2,
-                "ram": 1024,
-                "hdd": 8,
+                "ram": 2048,
+                "hdd": 10,
                "os": "ubuntu",
-                "version": "24.04"
+                "version": "24.10"
            }
        }
    ],
@@ -40,7 +40,7 @@
            "type": "warning"
        },
        {
-            "text": "Use Ubuntu 24.04 ONLY",
+            "text": "Use Ubuntu 24.10 ONLY",
            "type": "warning"
        },
        {
@@ -49,4 +49,4 @@
        }
    ],
    "status": "✅"
-}
+}
--- a/misc/.app-headers
+++ b/misc/.app-headers
@@ -1,4 +1,4 @@
-### Generated on 01-16-2025
+### Generated on 01-18-2025
 ##################################################

 ### 2fauth.sh
--- a/vm/debian-vm.sh
+++ b/vm/debian-vm.sh
@@ -402,7 +402,7 @@ done

 msg_info "Creating a Debian 12 VM"
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
-  -name $HN -tags proxmox-helper-scripts -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
+  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
 qm set $VMID \
--- a/vm/haos-vm.sh
+++ b/vm/haos-vm.sh
@@ -444,7 +444,7 @@ done
 msg_ok "Extracted KVM Disk Image"
 msg_info "Creating HAOS VM"
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
-  -name $HN -tags proxmox-helper-scripts -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
+  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 qm importdisk $VMID ${FILE%.*} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
 qm set $VMID \
--- a/vm/mikrotik-routeros.sh
+++ b/vm/mikrotik-routeros.sh
@@ -269,7 +269,7 @@ DISK_REF="${STORAGE}:${DISK_REF:-}${DISK_VAR:-}"
 msg_ok "Extracted Mikrotik RouterOS CHR Disk Image"
 msg_info "Creating Mikrotik RouterOS CHR VM"
 qm create $VMID -tablet 0 -localtime 1 -cores $CORE_COUNT -memory $RAM_SIZE -name $HN \
-  -tags proxmox-helper-scripts -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU \
+  -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU \
  -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 qm importdisk $VMID ${FILE%.*} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
 qm set $VMID \
--- a/vm/nextcloud-vm.sh
+++ b/vm/nextcloud-vm.sh
@@ -401,7 +401,7 @@ done

 msg_info "Creating a $NAME"
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios seabios${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
-  -name $HN -tags proxmox-helper-scripts -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
+  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 pvesm alloc $STORAGE $VMID $DISK1 12G 1>&/dev/null
 qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
--- a/vm/openwrt.sh
+++ b/vm/openwrt.sh
@@ -475,7 +475,7 @@ qm set $VMID \
  -efidisk0 ${DISK0_REF},efitype=4m,size=4M \
  -scsi0 ${DISK1_REF},size=512M \
  -boot order=scsi0 \
-  -tags proxmox-helper-scripts \
+  -tags community-script \
  -description "<div align='center'><a href='https://Helper-Scripts.com'><img src='https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/images/logo-81x112.png'/></a>

  # OpenWRT
@@ -498,8 +498,6 @@ send_line_to_vm "uci set network.lan.device=eth0"
 send_line_to_vm "uci set network.lan.proto=static"
 send_line_to_vm "uci set network.lan.ipaddr=${LAN_IP_ADDR}"
 send_line_to_vm "uci set network.lan.netmask=${LAN_NETMASK}"
-send_line_to_vm "uci set firewall.@zone[1].input='ACCEPT'"
-send_line_to_vm "uci set firewall.@zone[1].forward='ACCEPT'"
 send_line_to_vm "uci commit"
 send_line_to_vm "halt"
 msg_ok "Network interfaces have been successfully configured."
--- a/vm/owncloud-vm.sh
+++ b/vm/owncloud-vm.sh
@@ -401,7 +401,7 @@ done

 msg_info "Creating a $NAME"
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios seabios${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
-  -name $HN -tags proxmox-helper-scripts -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
+  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 pvesm alloc $STORAGE $VMID $DISK1 12G 1>&/dev/null
 qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
--- a/vm/ubuntu2204-vm.sh
+++ b/vm/ubuntu2204-vm.sh
@@ -402,7 +402,7 @@ done

 msg_info "Creating a Ubuntu 22.04 VM"
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
-  -name $HN -tags proxmox-helper-scripts -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
+  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
 qm set $VMID \
--- a/vm/ubuntu2404-vm.sh
+++ b/vm/ubuntu2404-vm.sh
@@ -370,7 +370,7 @@ msg_ok "Downloaded ${CL}${BL}${FILE}${CL}"

 STORAGE_TYPE=$(pvesm status -storage $STORAGE | awk 'NR>1 {print $2}')
 case $STORAGE_TYPE in
-nfs | dir)
+nfs | dir | cifs)
  DISK_EXT=".qcow2"
  DISK_REF="$VMID/"
  DISK_IMPORT="-format qcow2"
@@ -392,7 +392,7 @@ done

 msg_info "Creating a Ubuntu 24.04 VM"
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
-  -name $HN -tags proxmox-helper-scripts -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
+  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
 qm set $VMID \