normalize nfpm package spec

openziti · Mar 7, 2024 · 1c7d800 · 1c7d800
1 parent 0a24b98
commit 1c7d800
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/dist/dist-packages/linux/nfpm-openziti-controller.yaml b/dist/dist-packages/linux/nfpm-openziti-controller.yaml
@@ -12,22 +12,6 @@ description: >
 vendor: ${ZITI_VENDOR}
 homepage: ${ZITI_HOMEPAGE}
 license: Apache-2.0
-
-# Umask to be used on files without explicit mode set. (overridable)
-umask: 0o002
-
-# Package version within this release version.
-release: 1
-
-# Section.
-section: default
-
-# Priority.
-priority: optional
-
-depends:
-  - openziti  # ziti CLI
-
 # Contents to add to the package.
 contents:
   - dst: /lib/systemd/system/
@@ -47,4 +31,5 @@ contents:
 
   - dst: /opt/openziti/etc/controller/
     src: ./dist/dist-packages/linux/openziti-controller/entrypoint.bash
-
+depends:
+  - openziti  # ziti CLI
diff --git a/dist/dist-packages/linux/nfpm-openziti.yaml b/dist/dist-packages/linux/nfpm-openziti.yaml
@@ -23,10 +23,3 @@ contents:
     type: symlink
 replaces:
   - ziti-cli
-
-# packager-neutral scripts may be overridden by packager-specific scripts
-# scripts:
-  # preinstall: ./scripts/preinstall.sh
-  # postinstall: ./scripts/postinstall.sh
-  # preremove: ./scripts/preremove.sh
-  # postremove: ./scripts/postremove.sh