Merge pull request #60 from olifre/fix-service-start

goreleaser: enforce owner/group on user home and queue director
opensciencegrid · Feb 29, 2024 · cb5858b · cb5858b
2 parents f4ccffc + 090a125
commit cb5858b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -107,6 +107,11 @@ jobs:
       run: |
         podman exec pkgtest bash -c "dnf -y install /root/xrootd-monitoring-shoveler/xrootd-monitoring-shoveler*x86_64.rpm"
 
+    - name: Check user/group, permissions on queue directory
+      run: |
+        podman exec pkgtest bash -c "getent passwd xrootd-monitoring-shoveler"
+        podman exec pkgtest bash -c "ls -la /var/spool/"
+
     - name: Test createtoken command
       run: |
         podman exec pkgtest createtoken --help
@@ -133,8 +138,8 @@ jobs:
 
     - name: Test shoveler service
       run: |
-        podman exec pkgtest systemctl start xrootd-monitoring-shoveler
-        podman exec pkgtest systemctl status xrootd-monitoring-shoveler
+        podman exec pkgtest systemctl --full --lines=100 start xrootd-monitoring-shoveler
+        podman exec pkgtest systemctl --full --lines=100 status xrootd-monitoring-shoveler
 
     - name: Test shoveler-status
       run: |

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -103,10 +103,18 @@ nfpms:
         type: "config|noreplace"
       - src: config/xrootd-monitoring-shoveler.service
         dst: /usr/lib/systemd/system/xrootd-monitoring-shoveler.service
+      - dst: /var/spool/xrootd-monitoring-shoveler
+        type: dir
+        file_info:
+          mode: 0700
+          owner: xrootd-monitoring-shoveler
+          group: xrootd-monitoring-shoveler
       - dst: /var/spool/xrootd-monitoring-shoveler/queue
         type: dir
         file_info:
           mode: 0700
+          owner: xrootd-monitoring-shoveler
+          group: xrootd-monitoring-shoveler
     overrides:
       rpm:
         file_name_template: >-