Merge d242578c35 into 749e487032

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

.github/workflows/changelog-pr.yml

@@ -71,7 +71,9 @@ jobs:
             });
 
             pulls.filter((pr) => 
-              pr.merged_at && new Date(pr.merged_at) > latestDateInChangelog
+              pr.merged_at && 
+              new Date(pr.merged_at) > latestDateInChangelog && 
+              !pr.labels.some((label) => ["invalid", "wontdo", process.env.AUTOMATED_PR_LABEL].includes(label.name.toLowerCase()))
             ).forEach((pr) => {
               const prLabels = pr.labels.map((label) => label.name.toLowerCase());
               const prNote = `- ${pr.title} [@${pr.user.login}](https://github.com/${pr.user.login}) ([#${pr.number}](${pr.html_url}))`;
@@ -79,12 +81,11 @@ jobs:
               for (const { labels, notes } of categorizedPRs) {
                 const prHasCategoryLabel = labels.some((label) => prLabels.includes(label));
                 const isUnlabelledCategory = labels.length === 0;
-                const prShouldBeExcluded = prLabels.includes(process.env.AUTOMATED_PR_LABEL);
+                if (prHasCategoryLabel || isUnlabelledCategory) {
-                if ((prHasCategoryLabel || isUnlabelledCategory) && !prShouldBeExcluded) {
                   notes.push(prNote);
                   break;
                 }
-              };
+              }
             });
 
             return categorizedPRs;

CHANGELOG.md

@@ -20,14 +20,19 @@ Do not break established syntax in this file, as it is automatically updated by
 
 ### Changed
 
+### 💥 Breaking Changes
+
+- Removal calibre-server (no Headless Support) [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1362](https://github.com/community-scripts/ProxmoxVE/pull/1362))
+
 ### ✨ New Scripts
 
 - New Script: Prometheus Alertmanager [@andygrunwald](https://github.com/andygrunwald) ([#1272](https://github.com/community-scripts/ProxmoxVE/pull/1272))
 - New script: ps5-mqtt [@liecno](https://github.com/liecno) ([#1198](https://github.com/community-scripts/ProxmoxVE/pull/1198))
-- New Script: calibre-server [@ThisIsJeron](https://github.com/ThisIsJeron) ([#960](https://github.com/community-scripts/ProxmoxVE/pull/960))
 
 ### 🚀 Updated Scripts
 
+- Fix: AdventureLog: unzip to /opt/ [@JesperDramsch](https://github.com/JesperDramsch) ([#1370](https://github.com/community-scripts/ProxmoxVE/pull/1370))
+- Fix: Stirling-PDF > LibreOffice/unoconv Integration Issues  [@m6urns](https://github.com/m6urns) ([#1322](https://github.com/community-scripts/ProxmoxVE/pull/1322))
 - Fix: AdventureLog - update script bug [@JesperDramsch](https://github.com/JesperDramsch) ([#1334](https://github.com/community-scripts/ProxmoxVE/pull/1334))
 - Install/update ActualBudget based on releases, not latest master [@SpyrosRoum](https://github.com/SpyrosRoum) ([#1254](https://github.com/community-scripts/ProxmoxVE/pull/1254))
 - Fix Checkmk: Version grep broken [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1341](https://github.com/community-scripts/ProxmoxVE/pull/1341))

ct/adventurelog.sh

@@ -42,7 +42,7 @@ function update_script() {
     msg_info "Updating ${APP} to ${RELEASE}"
     mv /opt/adventurelog/ /opt/adventurelog-backup/
     wget -qO /opt/v${RELEASE}.zip "https://github.com/seanmorley15/AdventureLog/archive/refs/tags/v${RELEASE}.zip"
-    unzip -q /opt/v${RELEASE}.zip
+    unzip -q /opt/v${RELEASE}.zip -d /opt/
     mv /opt/AdventureLog-${RELEASE} /opt/adventurelog
 
     mv /opt/adventurelog-backup/backend/server/.env /opt/adventurelog/backend/server/.env

ct/calibre-server.sh

@@ -1,63 +0,0 @@
-#!/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: thisisjeron
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://calibre-ebook.com
-
-# App Default Values
-APP="Calibre-Server"
-var_tags="eBook"
-var_cpu="2"
-var_ram="1024"
-var_disk="4"
-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
-
-  if [[ ! -f /etc/systemd/system/calibre-server.service ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-  msg_info "Stopping ${APP}"
-  systemctl stop calibre-server
-  msg_ok "Stopped ${APP}"
-  
-  msg_info "Updating ${APP} Packages"
-  apt-get update &>/dev/null
-  apt-get -y upgrade &>/dev/null
-  msg_ok "Packages updated"
-
-  msg_info "Updating Calibre (latest)"
-  wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin &>/dev/null
-  msg_ok "Updated Calibre"
-
-  msg_info "Starting ${APP}"
-  systemctl start calibre-server
-  msg_ok "Started ${APP}"
-  msg_ok "Updated Successfully"
-  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}:8180${CL}" 

install/alpine-docker-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
 $STD apk add tzdata
-$STD apk add nano
-$STD apk add mc
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Docker"

install/alpine-grafana-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 msg_info "Installing Grafana"
 $STD apk add grafana

install/alpine-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

install/alpine-nextcloud-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
 $STD apk add openssl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 $STD apk add nginx
 msg_ok "Installed Dependencies"
 

install/alpine-vaultwarden-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
 $STD apk add openssl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 $STD apk add argon2
 msg_ok "Installed Dependencies"
 

install/alpine-zigbee2mqtt-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 msg_info "Installing Alpine-Zigbee2MQTT"
 $STD apk add zigbee2mqtt

install/calibre-server-install.sh

@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2024
-# Author: thisisjeron
-# License: MIT
-# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-
-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 \
-  sudo \
-  curl \
-  mc \
-  imagemagick \
-  xvfb \
-  libxcomposite1 \
-  libegl1 \
-  libopengl0
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Calibre"
-wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin
-useradd -c "Calibre Server" -d /opt/calibre -s /bin/bash -m calibre
-mkdir -p /opt/calibre/calibre-library
-chown -R calibre:calibre /opt/calibre
-msg_ok "Installed Calibre"
-
-msg_info "Creating Service"
-cat <<EOF >/etc/systemd/system/calibre-server.service
-[Unit]
-Description=Calibre Content Server
-After=network.target
-
-[Service]
-Type=simple
-User=calibre
-Group=calibre
-ExecStart=/opt/calibre/calibre-server --port=8180 --enable-local-write /opt/calibre/calibre-library
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now calibre-server.service
-msg_ok "Created Service"
-
-motd_ssh
-customize
-
-msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
-msg_ok "Cleaned"
- 

install/debian-install.sh

@@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

install/stirling-pdf-install.sh

@@ -36,7 +36,11 @@ msg_info "Installing LibreOffice Components"
 $STD apt-get install -y \
   libreoffice-writer \
   libreoffice-calc \
-  libreoffice-impress
+  libreoffice-impress \
+  libreoffice-core \
+  libreoffice-common \
+  libreoffice-base-core \
+  python3-uno
 msg_ok "Installed LibreOffice Components"
 
 msg_info "Installing Python Dependencies"
@@ -75,8 +79,8 @@ msg_ok "Installed Language Packs"
 
 msg_info "Installing Stirling-PDF (Additional Patience)"
 RELEASE=$(curl -s https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-wget -q https://github.com/Stirling-Tools/Stirling-PDF/archive/refs/tags/v$RELEASE.tar.gz
+wget -q https://github.com/Stirling-Tools/Stirling-PDF/archive/refs/tags/v${RELEASE}.tar.gz
-tar -xzf v$RELEASE.tar.gz
+tar -xzf v${RELEASE}.tar.gz
 cd Stirling-PDF-$RELEASE
 chmod +x ./gradlew
 $STD ./gradlew build
@@ -86,37 +90,66 @@ mv ./build/libs/Stirling-PDF-*.jar /opt/Stirling-PDF/
 mv scripts /opt/Stirling-PDF/
 ln -s /opt/Stirling-PDF/Stirling-PDF-$RELEASE.jar /opt/Stirling-PDF/Stirling-PDF.jar
 ln -s /usr/share/tesseract-ocr/5/tessdata/ /usr/share/tessdata
-msg_ok "Installed Stirling-PDF v$RELEASE"
+msg_ok "Installed Stirling-PDF"
 
 msg_info "Creating Service"
-cat <<EOF >/etc/systemd/system/stirlingpdf.service
+# Create LibreOffice listener service
+cat <<EOF >/etc/systemd/system/libreoffice-listener.service
 [Unit]
-Description=Stirling-PDF service
+Description=LibreOffice Headless Listener Service
-After=syslog.target network.target
+After=network.target
 
 [Service]
-SuccessExitStatus=143
+Type=simple
-
 User=root
 Group=root
-
+ExecStart=/usr/lib/libreoffice/program/soffice --headless --invisible --nodefault --nofirststartwizard --nolockcheck --nologo --accept="socket,host=127.0.0.1,port=2002;urp;StarOffice.ComponentContext"
-Type=simple
+Restart=always
-EnvironmentFile=/opt/Stirling-PDF/.env
-WorkingDirectory=/opt/Stirling-PDF
-ExecStart=/usr/bin/java -jar Stirling-PDF.jar
-ExecStop=/bin/kill -15 %n
 
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now stirlingpdf.service
+
+# Set up environment variables
+cat <<EOF >/opt/Stirling-PDF/.env
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/libreoffice/program
+UNO_PATH=/usr/lib/libreoffice/program
+PYTHONPATH=/usr/lib/python3/dist-packages:/usr/lib/libreoffice/program
+LD_LIBRARY_PATH=/usr/lib/libreoffice/program
+EOF
+
+cat <<EOF >/etc/systemd/system/stirlingpdf.service
+[Unit]
+Description=Stirling-PDF service
+After=syslog.target network.target libreoffice-listener.service
+Requires=libreoffice-listener.service
+
+[Service]
+SuccessExitStatus=143
+Type=simple
+User=root
+Group=root
+EnvironmentFile=/opt/Stirling-PDF/.env
+WorkingDirectory=/opt/Stirling-PDF
+ExecStart=/usr/bin/java -jar Stirling-PDF.jar
+ExecStop=/bin/kill -15 %n
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+# Enable and start services
+systemctl enable -q --now libreoffice-listener
+systemctl enable -q --now stirlingpdf
 msg_ok "Created Service"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -rf v$RELEASE.tar.gz /zulu-repo_1.0.0-3_all.deb
+rm -rf v${RELEASE}.tar.gz /zulu-repo_1.0.0-3_all.deb
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

install/ubuntu-install.sh

@@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

json/calibre-server.json

@@ -1,43 +0,0 @@
-{
-    "name": "Calibre-Server",
-    "slug": "calibre-server",
-    "categories": [
-      12
-    ],
-    "date_created": "2025-01-09",
-    "type": "ct",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": 8180,
-    "documentation": null,
-    "website": "https://calibre-ebook.com",
-    "logo": "https://calibre-ebook.com/resources/icons/calibre_icon.png",
-    "description": "Calibre content server is used to manage and serve eBooks over the network.",
-    "install_methods": [
-      {
-        "type": "default",
-        "script": "ct/calibre-server.sh",
-        "resources": {
-          "cpu": 2,
-          "ram": 1024,
-          "hdd": 4,
-          "os": "debian",
-          "version": "12"
-        }
-      }
-    ],
-    "default_credentials": {
-      "username": null,
-      "password": null
-    },
-    "notes": [
-      {
-        "text": "By default, the Calibre Server runs on port 8180 with no username/password.",
-        "type": "info"
-      },
-      {
-        "text": "Use 'calibredb add' from the calibre user or run 'xvfb-run calibredb add ...' if you need to add books while the server is running.",
-        "type": "info"
-      }
-    ]
-  } 

misc/alpine-install.func

@@ -133,6 +133,14 @@ update_os() {
   msg_ok "Updated Container OS"
 }
 
+# Install core packages that (almost) every container will depend upon.
+# Be sure to update install.func for apt-based systems as appropriate.
+install_core_packages() {
+  msg_info "Installing Core Packages"
+  $STD apk add curl mc nano newt openssh sudo
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
   # Set terminal to 256-color mode

misc/install.func

@@ -197,6 +197,15 @@ EOF
   msg_ok "Updated Container OS"
 }
 
+# Install core packages that (almost) every container will depend upon.
+# Be sure to update alpine-install.func to match for apk-based systems when
+# adding a new package.
+install_core_packages() {
+  msg_info "Installing Core Packages"
+  $STD apt-get install curl mc sudo
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
   # Set terminal to 256-color mode