avoid package-managed file revision conflicts

.goreleaser-linux-amd64.yml

@@ -112,9 +112,6 @@ nfpms:
       - dst: /usr/lib/systemd/user/
         src: ./nfpm/zrok-share@.service
 
-      - dst: /etc/systemd/system/zrok-share.service.d/override.conf
-        src: ./nfpm/zrok-share.service.override.conf
-
       - dst: /opt/openziti/etc/zrok
         type: dir
         file_info:

.goreleaser-linux-arm64.yml

@@ -116,9 +116,6 @@ nfpms:
       - dst: /usr/lib/systemd/user/
         src: ./nfpm/zrok-share@.service
 
-      - dst: /etc/systemd/system/zrok-share.service.d/override.conf
-        src: ./nfpm/zrok-share.service.override.conf
-
       - dst: /opt/openziti/etc/zrok
         type: dir
         file_info:

.goreleaser-linux-armel.yml

@@ -120,9 +120,6 @@ nfpms:
       - dst: /usr/lib/systemd/user/
         src: ./nfpm/zrok-share@.service
 
-      - dst: /etc/systemd/system/zrok-share.service.d/override.conf
-        src: ./nfpm/zrok-share.service.override.conf
-
       - dst: /opt/openziti/etc/zrok
         type: dir
         file_info:

.goreleaser-linux-armhf.yml

@@ -118,9 +118,6 @@ nfpms:
       - dst: /usr/lib/systemd/user/
         src: ./nfpm/zrok-share@.service
 
-      - dst: /etc/systemd/system/zrok-share.service.d/override.conf
-        src: ./nfpm/zrok-share.service.override.conf
-
       - dst: /opt/openziti/etc/zrok
         type: dir
         file_info:

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 FIX: `zrok enable` now handles the case where the user ID does not resolve to a username when generating the default environment description (https://github.com/openziti/zrok/issues/959)
 
+FIX: Linux packages were optimized to avoid manage file revision conflicts (https://github.com/openziti/zrok/issues/817)
+
 ## v1.0.4
 
 FIX: `zrok admin bootstrap` and `zrok enable` functionality were broken in `v1.0.3`. A bad combination of dependencies caused issues with marshalling data from the associated controller endpoints

nfpm/zrok-share.service

@@ -13,5 +13,8 @@ ExecStart=/opt/openziti/bin/zrok-share.bash
 Restart=always
 RestartSec=3
 
+# allow adding tun device and IP routes and iptables rules; required when ZROK_BACKEND_MODE=vpn
+# AmbientCapabilities=CAP_NET_ADMIN
+
 [Install]
 WantedBy=multi-user.target

nfpm/zrok-share.service.override.conf

@@ -1,8 +0,0 @@
-[Service]
-
-#
-## extra permissions
-#
-
-# allow adding tun device and IP routes and iptables rules; required when ZROK_BACKEND_MODE=vpn
-# AmbientCapabilities=CAP_NET_ADMIN