upgpkg: headscale 0.22.1-1

upstream release

Removed systemd service and include systemd file from upstream instead
Remove config socket override since upstream config is now the same.

3 files changed, 6 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae505453eddb..45ea120025b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = headscale
 	pkgdesc = An open source, self-hosted implementation of the Tailscale coordination server.
-	pkgver = 0.21.0
+	pkgver = 0.22.1
 	pkgrel = 1
 	url = https://github.com/juanfont/headscale
 	arch = x86_64
@@ -14,12 +14,10 @@ pkgbase = headscale
 	conflicts = headscale-git
 	backup = etc/headscale/config.yaml
 	backup = etc/headscale/derp.yaml
-	source = headscale-0.21.0.tar.gz::https://github.com/juanfont/headscale/archive/refs/tags/v0.21.0.tar.gz
-	source = headscale.service
+	source = headscale-0.22.1.tar.gz::https://github.com/juanfont/headscale/archive/refs/tags/v0.22.1.tar.gz
 	source = headscale.sysusers
 	source = headscale.tmpfiles
-	sha256sums = 2afbdc038508cb694be496db9ba6b63bbc611b7038e8299e60eef0f1b227f12f
-	sha256sums = 3cae7a3bfbb70bfda8dc4323d27cdcde0d841d1b3335c0f10525907eb3f6e650
+	sha256sums = 88f57dd5478320110b219ce66516fa18c1d1a372d5a281daafb5a61265a6819f
 	sha256sums = 059353f4843dec6eb447c567fac890ef63cc9c8acea18840fcfc3f4a76d596db
 	sha256sums = 8a22d7193ceeac0be32725cf8108f963be3a21855e6099de964f810094d0adc7
 
diff --git a/PKGBUILD b/PKGBUILD
index 1f77ddebb542..d21640bef7fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintained at: https://github.com/matt-h/aur-pkgbuilds
 
 pkgname=headscale
-pkgver=0.21.0
+pkgver=0.22.1
 pkgrel=1
 pkgdesc="An open source, self-hosted implementation of the Tailscale coordination server."
 arch=('x86_64' 'armv7h' 'aarch64')
@@ -19,12 +19,10 @@ backup=("etc/${pkgname}/config.yaml" "etc/${pkgname}/derp.yaml")
 
 source=(
 	"${pkgname}-${pkgver}.tar.gz::https://github.com/juanfont/headscale/archive/refs/tags/v${pkgver}.tar.gz"
-	'headscale.service'
 	'headscale.sysusers'
 	'headscale.tmpfiles'
 )
-sha256sums=('2afbdc038508cb694be496db9ba6b63bbc611b7038e8299e60eef0f1b227f12f'
-            '3cae7a3bfbb70bfda8dc4323d27cdcde0d841d1b3335c0f10525907eb3f6e650'
+sha256sums=('88f57dd5478320110b219ce66516fa18c1d1a372d5a281daafb5a61265a6819f'
             '059353f4843dec6eb447c567fac890ef63cc9c8acea18840fcfc3f4a76d596db'
             '8a22d7193ceeac0be32725cf8108f963be3a21855e6099de964f810094d0adc7')
 
@@ -36,7 +34,6 @@ build() {
    export CGO_LDFLAGS="${LDFLAGS}"
    export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
    go build -v -o headscale -tags="ts2019" -ldflags "-linkmode external -extldflags \"${LDFLAGS}\" -s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=${pkgver}" ./cmd/headscale
-   sed -i 's-/var/run/headscale\.sock-/var/run/headscale/headscale\.sock-' config-example.yaml
 }
 
 package() {
@@ -54,5 +51,5 @@ package() {
 
 	install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-	install -D -m644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+	install -D -m644 "docs/packaging/headscale.systemd.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 }
diff --git a/headscale.service b/headscale.service
deleted file mode 100644
index ab2cfa15ba91..000000000000
--- a/headscale.service
+++ /dev/null
@@ -1,56 +0,0 @@
-[Unit]
-Description=Headscale controller
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/headscale serve
-WorkingDirectory=/var/lib/headscale
-ConfigurationDirectory=headscale
-RuntimeDirectory=headscale
-User=headscale
-Group=headscale
-
-DynamicUser=yes
-Restart=always
-RestartSec=5
-
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-
-# If headscale is run at ports >1024, you should apply these options via a
-# drop-in file
-#CapabilityBoundingSet=
-#AmbientCapabilities=
-#PrivateUsers=yes
-
-NoNewPrivileges=yes
-
-LimitNOFILE=1048576
-UMask=0077
-
-ProtectSystem=strict
-ProtectHome=yes
-ReadWritePaths=/var/lib/headscale /var/run/headscale
-PrivateTmp=yes
-PrivateDevices=yes
-ProtectHostname=yes
-ProtectClock=yes
-ProtectKernelTunables=yes
-ProtectKernelModules=yes
-ProtectKernelLogs=yes
-ProtectControlGroups=yes
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
-RestrictNamespaces=yes
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-RestrictRealtime=yes
-RestrictSUIDSGID=yes
-RemoveIPC=yes
-
-SystemCallFilter=@system-service
-SystemCallFilter=~@privileged @resources
-SystemCallArchitectures=native
-
-[Install]
-WantedBy=multi-user.target