diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | cloudflared-bin.install | 15 | ||||
| -rw-r--r-- | sysusers.d | 1 | ||||
| -rw-r--r-- | tmpfiles.d | 3 |
5 files changed, 21 insertions, 23 deletions
@@ -1,9 +1,8 @@ pkgbase = cloudflared-bin pkgdesc = An Argo Tunnel client which proxies any local webserver through the Cloudflare network pkgver = 2019.6.0 - pkgrel = 1 + pkgrel = 2 url = https://developers.cloudflare.com/argo-tunnel/ - install = cloudflared-bin.install arch = x86_64 arch = i686 arch = armv6h @@ -16,10 +15,14 @@ pkgbase = cloudflared-bin source = cloudflared.yml source = cloudflared@.service source = cloudflared-dns.service + source = sysusers.d + source = tmpfiles.d sha256sums = 6a486a0f6c00e87cce1caf0aa8db45ea9fefd0bf91d9be6fc44460160dc0dbda sha256sums = 4e06eb54143d872f73707ed2bba2ba2198649d3066df741bd0cfda5d1a5f334d sha256sums = 791ec5bebea5863544f5e0db0d9184a5bbb75e66725f7505e83e252f51d84376 sha256sums = 7f6251ade23609189516375a1e8155e8457dd36e35ce24435e552dc6af0ad7a7 + sha256sums = b99355e340a6b40b50ff3a68bb07767f7fe3376231831f628d1872b3c3fbe16a + sha256sums = fa0edefa9e8cc4ae2a1ddb7c894819f1011095188dc2917bad10afdd429beea4 source_x86_64 = https://bin.equinox.io/a/3RpFAEt45ov/cloudflared-2019.6.0-linux-amd64.tar.gz sha256sums_x86_64 = 524528ed564f1ac62ce25856b80efad5d56a37201af65a27d47ee9d5440a650c source_i686 = https://bin.equinox.io/a/HWhnqWigiY/cloudflared-2019.6.0-linux-386.tar.gz @@ -2,7 +2,7 @@ pkgname=cloudflared-bin pkgver=2019.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="An Argo Tunnel client which proxies any local webserver through the Cloudflare network" arch=("x86_64" "i686" "armv6h" "armv7h") url="https://developers.cloudflare.com/argo-tunnel/" @@ -10,11 +10,12 @@ license=("custom") depends=("glibc") provides=("cloudflared") conflicts=("cloudflared") -install="cloudflared-bin.install" source=("https://raw.githubusercontent.com/cloudflare/cloudflared/master/LICENSE" "cloudflared.yml" "cloudflared@.service" - "cloudflared-dns.service") + "cloudflared-dns.service" + "sysusers.d" + "tmpfiles.d") source_x86_64=("https://bin.equinox.io/a/3RpFAEt45ov/cloudflared-2019.6.0-linux-amd64.tar.gz") source_i686=("https://bin.equinox.io/a/HWhnqWigiY/cloudflared-2019.6.0-linux-386.tar.gz") source_armv6h=("https://bin.equinox.io/a/gEZP5gmXUU9/cloudflared-2019.6.0-linux-arm.tar.gz") @@ -22,7 +23,9 @@ source_armv7h=("https://bin.equinox.io/a/gEZP5gmXUU9/cloudflared-2019.6.0-linux- sha256sums=('6a486a0f6c00e87cce1caf0aa8db45ea9fefd0bf91d9be6fc44460160dc0dbda' '4e06eb54143d872f73707ed2bba2ba2198649d3066df741bd0cfda5d1a5f334d' '791ec5bebea5863544f5e0db0d9184a5bbb75e66725f7505e83e252f51d84376' - '7f6251ade23609189516375a1e8155e8457dd36e35ce24435e552dc6af0ad7a7') + '7f6251ade23609189516375a1e8155e8457dd36e35ce24435e552dc6af0ad7a7' + 'b99355e340a6b40b50ff3a68bb07767f7fe3376231831f628d1872b3c3fbe16a' + 'fa0edefa9e8cc4ae2a1ddb7c894819f1011095188dc2917bad10afdd429beea4') sha256sums_x86_64=('524528ed564f1ac62ce25856b80efad5d56a37201af65a27d47ee9d5440a650c') sha256sums_i686=('4ad5ec9b744754491b3bbfe71d5130f7a4fcd4bea5224387a5bd0ccf460cf236') sha256sums_armv6h=('5b45543e1e2b1bde7259d042144bb06fffcea480e8cddf4a93e7bb7cb660a71b') @@ -37,8 +40,11 @@ package() { # Configuration File install -Dm644 cloudflared.yml ${pkgdir}/etc/cloudflared/cloudflared.yml.example - install -Dm644 cloudflared@.service ${pkgdir}/usr/lib/systemd/system/cloudflared@.service - install -Dm644 cloudflared-dns.service ${pkgdir}/usr/lib/systemd/system/cloudflared-dns.service + install -Dm644 -t ${pkgdir}/usr/lib/systemd/system cloudflared{@,-dns}.service + + # Post install + install -Dm644 sysusers.d ${pkgdir}/usr/lib/sysusers.d/cloudflared.conf + install -Dm644 tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/cloudflared.conf } # vim: ts=2 sw=2 et: diff --git a/cloudflared-bin.install b/cloudflared-bin.install deleted file mode 100644 index c2ef943175cd..000000000000 --- a/cloudflared-bin.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - getent passwd cloudflared &>/dev/null || useradd --system --user-group -m --home /var/lib/cloudflared cloudflared - chown cloudflared.cloudflared /etc/cloudflared - touch /var/log/cloudflared.log - chown cloudflared.cloudflared /var/log/cloudflared.log -} - -post_upgrade() { - getent passwd cloudflared &>/dev/null || useradd --system --user-group -m --home /var/lib/cloudflared cloudflared - chown cloudflared.cloudflared /etc/cloudflared - touch /var/log/cloudflared.log - chown cloudflared.cloudflared /var/log/cloudflared.log -} - -# vim: ts=2 sw=2 et:
\ No newline at end of file diff --git a/sysusers.d b/sysusers.d new file mode 100644 index 000000000000..ee46f3c764ba --- /dev/null +++ b/sysusers.d @@ -0,0 +1 @@ +u cloudflared - "Cloudflare Argo Tunnel Daemon" /var/lib/cloudflared
\ No newline at end of file diff --git a/tmpfiles.d b/tmpfiles.d new file mode 100644 index 000000000000..022441d6fad3 --- /dev/null +++ b/tmpfiles.d @@ -0,0 +1,3 @@ +d /var/lib/cloudflared 0700 cloudflared cloudflared +f /var/log/cloudflared.log 0600 cloudflared cloudflared +z /etc/cloudflared - cloudflared cloudflared
\ No newline at end of file |