mirror of
https://github.com/openziti/zrok.git
synced 2025-06-21 02:07:44 +02:00
avoid package-managed file revision conflicts
This commit is contained in:
parent
97ca59a750
commit
6d0c795d59
@ -112,9 +112,6 @@ nfpms:
|
|||||||
- dst: /usr/lib/systemd/user/
|
- dst: /usr/lib/systemd/user/
|
||||||
src: ./nfpm/zrok-share@.service
|
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
|
- dst: /opt/openziti/etc/zrok
|
||||||
type: dir
|
type: dir
|
||||||
file_info:
|
file_info:
|
||||||
|
@ -116,9 +116,6 @@ nfpms:
|
|||||||
- dst: /usr/lib/systemd/user/
|
- dst: /usr/lib/systemd/user/
|
||||||
src: ./nfpm/zrok-share@.service
|
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
|
- dst: /opt/openziti/etc/zrok
|
||||||
type: dir
|
type: dir
|
||||||
file_info:
|
file_info:
|
||||||
|
@ -120,9 +120,6 @@ nfpms:
|
|||||||
- dst: /usr/lib/systemd/user/
|
- dst: /usr/lib/systemd/user/
|
||||||
src: ./nfpm/zrok-share@.service
|
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
|
- dst: /opt/openziti/etc/zrok
|
||||||
type: dir
|
type: dir
|
||||||
file_info:
|
file_info:
|
||||||
|
@ -118,9 +118,6 @@ nfpms:
|
|||||||
- dst: /usr/lib/systemd/user/
|
- dst: /usr/lib/systemd/user/
|
||||||
src: ./nfpm/zrok-share@.service
|
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
|
- dst: /opt/openziti/etc/zrok
|
||||||
type: dir
|
type: dir
|
||||||
file_info:
|
file_info:
|
||||||
|
@ -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: `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
|
## 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
|
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
|
||||||
|
@ -13,5 +13,8 @@ ExecStart=/opt/openziti/bin/zrok-share.bash
|
|||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=3
|
RestartSec=3
|
||||||
|
|
||||||
|
# allow adding tun device and IP routes and iptables rules; required when ZROK_BACKEND_MODE=vpn
|
||||||
|
# AmbientCapabilities=CAP_NET_ADMIN
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
@ -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
|
|
Loading…
x
Reference in New Issue
Block a user