Merge f1bad5ef52 into e1daaa6409

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

.github/workflows/validate-filenames.yml

@@ -16,6 +16,7 @@ jobs:
 
     steps:
       - name: Get pull request information
+        if: github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         id: pr
         with:
@@ -30,13 +31,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
-          ref: ${{ fromJSON(steps.pr.outputs.result).merge_commit_sha }}
+          ref: ${{ github.event_name == 'pull_request_target' && fromJSON(steps.pr.outputs.result).merge_commit_sha || '' }}
 
       - name: Get changed files
         id: changed-files
         run: |
-          if ${{ github.event_name == 'pull_request' }}; then
+          if ${{ github.event_name == 'pull_request_target' }}; then
-              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs)" >> $GITHUB_OUTPUT
+              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ steps.pr.outputs.result && fromJSON(steps.pr.outputs.result).merge_commit_sha }} | xargs)" >> $GITHUB_OUTPUT
           else
               echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT
           fi
@@ -88,7 +89,7 @@ jobs:
           fi
 
       - name: Post results and comment
-        if: always() && steps.check-scripts.outputs.files != '' && steps.check-json.outputs.files != '' && github.event_name == 'pull_request'
+        if: always() && steps.check-scripts.outputs.files != '' && steps.check-json.outputs.files != '' && github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         with:
           script: |

.github/workflows/validate-formatting.yaml

@@ -18,6 +18,7 @@ jobs:
 
     steps:
       - name: Get pull request information
+        if: github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         id: pr
         with:
@@ -32,13 +33,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
-          ref: ${{ fromJSON(steps.pr.outputs.result).merge_commit_sha }}
+          ref: ${{ github.event_name == 'pull_request_target' && fromJSON(steps.pr.outputs.result).merge_commit_sha || '' }}
 
       - name: Get changed files
         id: changed-files
         run: |
           if ${{ github.event_name == 'pull_request' }}; then
-              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
+              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ steps.pr.outputs.result && fromJSON(steps.pr.outputs.result).merge_commit_sha }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
           else
               echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
           fi

.github/workflows/validate-scripts.yml

@@ -17,6 +17,7 @@ jobs:
 
     steps:
       - name: Get pull request information
+        if: github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         id: pr
         with:
@@ -31,7 +32,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
-          ref: ${{fromJSON(steps.pr.outputs.result).merge_commit_sha}}
+          ref: ${{ github.event_name == 'pull_request_target' && fromJSON(steps.pr.outputs.result).merge_commit_sha || '' }}
           
       - name: Set execute permission for .sh files
         run: |
@@ -40,8 +41,8 @@ jobs:
       - name: Get changed files
         id: changed-files
         run: |
-          if ${{ github.event_name == 'pull_request' }}; then
+          if ${{ github.event_name == 'pull_request_target' }}; then
-              echo "files=$(git diff --name-only -r HEAD^1 HEAD | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
+              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ steps.pr.outputs.result && fromJSON(steps.pr.outputs.result).merge_commit_sha }} | xargs)" >> $GITHUB_OUTPUT
           else
               echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
           fi
@@ -167,7 +168,7 @@ jobs:
           fi
 
       - name: Post results and comment
-        if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request'
+        if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         with:
           script: |

CHANGELOG.md

@@ -16,6 +16,18 @@ 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-08
+
+### Changed
+
+### 🌐 Website
+
+- update postgresql json to add post install password setup [@rdiazlugo](https://github.com/rdiazlugo) ([#1318](https://github.com/community-scripts/ProxmoxVE/pull/1318))
+
+### 🧰 Maintenance
+
+- fix: correctly handle pull_request_target event [@se-bastiaan](https://github.com/se-bastiaan) ([#1327](https://github.com/community-scripts/ProxmoxVE/pull/1327))
+
 ## 2025-01-07
 
 ### Changed

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"
@@ -88,29 +92,61 @@ ln -s /opt/Stirling-PDF/Stirling-PDF-$RELEASE.jar /opt/Stirling-PDF/Stirling-PDF
 ln -s /usr/share/tesseract-ocr/5/tessdata/ /usr/share/tessdata
 msg_ok "Installed Stirling-PDF v$RELEASE"
 
-msg_info "Creating Service"
+msg_info "Configuring LibreOffice 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
+
-msg_ok "Created 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
+
+msg_info "Creating StirlingPDF Service"
+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 libreoffice-listener
+systemctl enable -q stirlingpdf
+systemctl start libreoffice-listener
+systemctl start stirlingpdf
+msg_ok "Created and Started Services"
 
 motd_ssh
 customize