From 6d0c795d593c33af43b5a758dc467752157f7851 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Tue, 6 May 2025 14:46:47 -0400 Subject: [PATCH] avoid package-managed file revision conflicts --- .goreleaser-linux-amd64.yml | 3 --- .goreleaser-linux-arm64.yml | 3 --- .goreleaser-linux-armel.yml | 3 --- .goreleaser-linux-armhf.yml | 3 --- CHANGELOG.md | 2 ++ nfpm/zrok-share.service | 3 +++ nfpm/zrok-share.service.override.conf | 8 -------- 7 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 nfpm/zrok-share.service.override.conf diff --git a/.goreleaser-linux-amd64.yml b/.goreleaser-linux-amd64.yml index e93c58c9..6dbc515b 100644 --- a/.goreleaser-linux-amd64.yml +++ b/.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: diff --git a/.goreleaser-linux-arm64.yml b/.goreleaser-linux-arm64.yml index d58955f8..37bdb639 100644 --- a/.goreleaser-linux-arm64.yml +++ b/.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: diff --git a/.goreleaser-linux-armel.yml b/.goreleaser-linux-armel.yml index 52ea8fb8..5ed2aa3e 100644 --- a/.goreleaser-linux-armel.yml +++ b/.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: diff --git a/.goreleaser-linux-armhf.yml b/.goreleaser-linux-armhf.yml index 4f71e078..781e980e 100644 --- a/.goreleaser-linux-armhf.yml +++ b/.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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ea3d6cf..62110ea6 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/nfpm/zrok-share.service b/nfpm/zrok-share.service index fdb528f3..99c20f65 100644 --- a/nfpm/zrok-share.service +++ b/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 diff --git a/nfpm/zrok-share.service.override.conf b/nfpm/zrok-share.service.override.conf deleted file mode 100644 index 9cf870a9..00000000 --- a/nfpm/zrok-share.service.override.conf +++ /dev/null @@ -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