Merge f3db85739e into 81b271a9ef

Update .app-headers file (#1567 )
[jellyseerr] Update nodejs if not up-to-date (#1563 )
2025-01-31 04:50:14 +00:00 · 2025-01-18 15:22:57 +01:00 · 2025-01-18 13:30:09 +01:00 · 2025-01-18 11:39:23 +01:00 · 2025-01-18 11:39:02 +01:00 · 2025-01-18 09:00:29 +01:00
15 changed files with 264 additions and 12 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,10 +16,20 @@ 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-17
+
+## 2025-01-18

 ### Changed

+### 💥 Breaking Changes
+
+- 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
+
+- 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/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
--- a/ct/mealie.sh
+++ b/ct/mealie.sh
@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
+# Copyright (c) 2021-2025 community-scripts ORG
+# Author: TheRealVira
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/mealie-recipes/mealie
+
+# App Default Values
+APP="mealie"
+var_tags="food"
+var_cpu="2"
+var_ram="2048"
+var_disk="6"
+var_os="debian"
+var_version="12"
+var_unprivileged="1"
+
+# App Output & Base Settings
+header_info "$APP"
+base_settings
+
+# Core
+variables
+color
+catch_errors
+
+function update_script() {
+    header_info
+    check_container_storage
+    check_container_resources
+
+    # Check if installation is present | -f for file, -d for folder
+    if [[ ! -d "/opt/${APP}" ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+
+    RELEASE=$(curl -s https://api.github.com/repos/mealie-recipes/mealie/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+    if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f "/opt/${APP}_version.txt" ]]; then
+        # Crawling the new version and checking whether an update is required
+        msg_info "Updating System"
+        apt-get update &>/dev/null
+        apt-get -y upgrade &>/dev/null
+        msg_ok "Updated System"
+
+        # Execute Update
+        msg_info "Updating ${APP}"
+        # TBD
+
+        echo "${RELEASE}" >/opt/${APP}_version.txt
+        msg_ok "Updated ${APP}"
+
+        # Cleaning up
+        msg_info "Cleaning Up"
+        rm "${RELEASE}.zip"
+        $STD apt-get -y autoremove
+        $STD apt-get -y autoclean
+        msg_ok "Cleanup Completed"
+    else
+        msg_ok "No update required. ${APP} is already at ${RELEASE}"
+    fi
+    exit
+}
+
+start
+build_container
+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}:9000${CL}"
--- a/install/mealie-install.sh
+++ b/install/mealie-install.sh
@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2025 community-scripts ORG
+# Author: TheRealVira
+# License: MIT
+# Source: https://github.com/mealie-recipes/mealie
+
+# Import Functions und Setup
+source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y \
+    nodejs \
+    npm \
+    sudo \
+    git \
+    python3 \
+    curl \
+    mc \
+    build-essential \
+    libwebp-dev \
+    libsasl2-dev \
+    libldap2-dev \
+    libssl-dev \
+    gnupg \
+    gnupg2 \
+    gnupg1 \
+    gosu \
+    iproute2 \
+    libldap-common \
+    libldap-2.5
+
+mkdir /app
+npm install -g yarn
+msg_ok "Installed Dependencies"
+
+RELEASE=$(curl -s https://api.github.com/repos/mealie-recipes/mealie/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+msg_info "Downloading mealie ${RELEASE}"
+wget -q "https://github.com/mealie-recipes/mealie/archive/refs/tags/${RELEASE}.zip"
+unzip "${RELEASE}.zip" -d /app/mealie
+echo "${RELEASE}" >/app/mealie_version.txt
+msg_ok "Downloading mealie ${RELEASE}"
+
+msg_info "Setting up frontend"
+cd /app/mealie
+/usr/local/bin/yarn install \
+    --prefer-offline \
+    --frozen-lockfile \
+    --non-interactive \
+    --production=false \
+    --network-timeout=1000000
+/usr/local/bin/yarn generate
+msg_ok "Setting up frontend"
+
+msg_info "Setting up ENV"
+cat <<EOF >>/etc/environment
+MEALIE_HOME="/app"
+
+PYTHONUNBUFFERED=1
+PYTHONDONTWRITEBYTECODE=1
+PIP_NO_CACHE_DIR=off
+PIP_DISABLE_PIP_VERSION_CHECK=on
+PIP_DEFAULT_TIMEOUT=100
+POETRY_HOME="/opt/poetry"
+POETRY_VIRTUALENVS_IN_PROJECT=true
+POETRY_NO_INTERACTION=1
+POETRY_VERSION=1.3.1
+PYSETUP_PATH="/opt/pysetup"
+VENV_PATH="/opt/pysetup/.venv"
+
+PRODUCTION=true
+TESTING=false
+LD_LIBRARY_PATH=/usr/local/lib
+APP_PORT=9000
+STATIC_FILES=/spa/static
+HOST 0.0.0.0
+EOF
+export PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
+set -a; source /etc/environment; set +a;
+msg_ok "Setting up ENV"
+
+msg_info "Create user account"
+useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc
+usermod -G users abc
+msg_ok "Create user account"
+
+msg_info "Builder Image"
+pip install -U --no-cache-dir pip
+curl -sSL https://install.python-poetry.org | python3 -
+cd $PYSETUP_PATH
+cp ./poetry.lock ./pyproject.toml ./
+poetry install -E pgsql --only main
+msg_ok "Builder Image"
+
+msg_info "CRFPP Image"
+mkdir -p /run/secrets
+cp ./mealie $MEALIE_HOME/mealie
+cp ./poetry.lock ./pyproject.toml $MEALIE_HOME/
+cd $MEALIE_HOME
+. $VENV_PATH/bin/activate
+poetry install -E pgsql --only main
+cd ~
+python $MEALIE_HOME/mealie/scripts/install_model.py
+msg_ok "CRFPP Image"
+
+msg_info "Copy Frontend"
+cp /app/dist $STATIC_FILES
+cp ./docker/entry.sh $MEALIE_HOME/run.sh
+chmod +x $MEALIE_HOME/run.sh
+$MEALIE_HOME/run.sh
+msg_ok "Copy Frontend"
+
+motd_ssh
+customize
--- a/json/mealie.json
+++ b/json/mealie.json
@ -0,0 +1,34 @@
+{
+    "name": "mealie",
+    "slug": "mealie",
+    "categories": [
+        0
+    ],
+    "date_created": "2025-01-01",
+    "type": "ct",
+    "updateable": true,
+    "privileged": false,
+    "interface_port": 9000,
+    "documentation": "https://docs.mealie.io/",
+    "website": "https://mealie.io/",
+    "logo": "https://raw.githubusercontent.com/mealie-recipes/mealie/refs/heads/mealie-next/docs/docs/assets/img/favicon.png",
+    "description": "A self-hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family.",
+    "install_methods": [
+        {
+            "type": "default",
+            "script": "ct/mealie.sh",
+            "resources": {
+                "cpu": 2,
+                "ram": 2048,
+                "hdd": 6,
+                "os": "debian",
+                "version": "12"
+            }
+        }
+    ],
+    "default_credentials": {
+        "username": null,
+        "password": null
+    },
+    "notes": []
+}
--- 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
--- 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
@ -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 \
Author	SHA1	Message	Date
Johanna Rührig	1638e104e2	Merge `f3db85739e` into `81b271a9ef`	2025-01-18 15:22:57 +01:00
github-actions[bot]	81b271a9ef	Update .app-headers file (#1567 ) Some checks are pending Auto Update .app-headers / update-app-headers (push) Waiting to run Details Shellcheck / Shellcheck (push) Waiting to run Details Create Changelog Pull Request / update-changelog-pull-request (push) Waiting to run Details	2025-01-18 13:30:09 +01:00
Max Slotov	75590a8ff8	[jellyseerr] Update nodejs if not up-to-date (#1563 ) * [jellyseerr] Update nodejs if not up-to-date * simplify if	2025-01-18 11:39:23 +01:00
Gerhard Burger	d1f5556ce3	Fix linkwarden update (#1565 )	2025-01-18 11:39:02 +01:00
community-scripts-pr-app[bot]	e683fd900f	Update CHANGELOG.md (#1547 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2025-01-18 09:00:29 +01:00
CanbiZ	643e0f5ac8	Update CHANGELOG.md	2025-01-18 08:57:56 +01:00
oOStroudyOo	bd301942c5	Update VM Tags (#1562 ) * haos-vm.sh tag * debian-vm.sh tag * Update mikrotik-routeros.sh tag * Update nextcloud-vm.sh tag * Update openwrt.sh tag * Update owncloud-vm.sh tag * Update ubuntu2204-vm.sh tag * Update ubuntu2404-vm.sh tag * Add pimox-haos-vm.sh tag * Undo add tag Unable to test	2025-01-18 08:03:51 +01:00
Johanna Rührig	f3db85739e	debugging npm yarn.	2025-01-01 21:35:10 +01:00
Johanna Rührig	66015ba45c	debugging npm yarn.	2025-01-01 21:31:37 +01:00
Johanna Rührig	303f08e488	removed duplicate mkdir.	2025-01-01 21:28:44 +01:00
Johanna Rührig	1f1e0c31bf	Fixing name issues.	2025-01-01 21:27:31 +01:00
Johanna Rührig	36c004706b	fixes.	2025-01-01 21:25:13 +01:00
Johanna Rührig	7f69965576	Added mc.	2025-01-01 21:22:02 +01:00
Johanna Rührig	f8f890f01f	Added unzip.	2025-01-01 21:18:35 +01:00
Johanna Rührig	8b691a5b79	source env vars.	2025-01-01 21:15:15 +01:00
Johanna Rührig	496792f102	fixing useradd command.	2025-01-01 21:11:53 +01:00
Johanna Rührig	46669f4cfe	Added missing folder.	2025-01-01 21:10:24 +01:00
Johanna Rührig	0ae1c6492b	Removed 5etools. Different project...	2025-01-01 20:49:28 +01:00
Johanna Rührig	ebcb0e846b	Init mealie lxc.	2025-01-01 20:48:05 +01:00
Johanna Rührig	aca900782e	Testing 5etools.	2024-12-31 18:44:46 +01:00