summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD9
-rw-r--r--puma-dev-git.install4
-rw-r--r--user.service (renamed from puma-dev@.service)4
5 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index faeffff0f774..9a5b01caaca5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,10 +7,11 @@ pkgbase = puma-dev-git
arch = x86_64
license = BSD-3-Clause
makedepends = go
+ depends = authbind
provides = puma-dev
source = puma-dev-git::git+https://github.com/puma/puma-dev
- source = puma-dev@.service
+ source = user.service
md5sums = SKIP
- md5sums = a080c67779718704cb55aa1aaf6eb3ef
+ md5sums = 308627b449810f382900a2e2d263862e
pkgname = puma-dev-git
diff --git a/.gitignore b/.gitignore
index 91690dffb556..6b325a631092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
!.SRCINFO
!PKGBUILD
!puma-dev-git.install
-!puma-dev@.service \ No newline at end of file
+!user.service \ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index ef93ef53d59b..71f6bbb22e08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,19 @@
# Maintainer: Zacharias Knudsen <z@chari.as>
pkgname=puma-dev-git
pkgver=v0.18.3.r0.gdb9ec15
-pkgrel=1
+pkgrel=2
pkgdesc="A tool to manage rack apps in development with puma "
arch=('x86_64')
url="https://github.com/puma/puma-dev"
license=('BSD-3-Clause')
+depends=('authbind')
makedepends=('go')
provides=('puma-dev')
install=puma-dev-git.install
source=("$pkgname::git+$url"
- 'puma-dev@.service')
+ 'user.service')
md5sums=('SKIP'
- 'a080c67779718704cb55aa1aaf6eb3ef')
+ '308627b449810f382900a2e2d263862e')
pkgver() {
cd "$pkgname"
@@ -38,5 +39,5 @@ package() {
cd "$pkgname"
install -Dm755 build/puma-dev "$pkgdir"/usr/bin/puma-dev
- install -Dm644 "$srcdir"/puma-dev@.service "$pkgdir"/usr/lib/systemd/system/puma-dev@.service
+ install -Dm644 "$srcdir"/user.service "$pkgdir"/usr/lib/systemd/user/puma-dev.service
}
diff --git a/puma-dev-git.install b/puma-dev-git.install
index 54ba1f2fe1b2..b99f00216cc9 100644
--- a/puma-dev-git.install
+++ b/puma-dev-git.install
@@ -1,3 +1,5 @@
post_install() {
- printf "To enable puma-dev, use systemctl enable --now puma-dev@USER\n"
+ printf "To enable puma-dev, use:\n"
+ printf "sudo setcap 'cap_net_bind_service=+ep' /usr/bin/puma-dev\n"
+ printf "systemctl --user enable --now puma-dev\n"
}
diff --git a/puma-dev@.service b/user.service
index 5a06e2fcb8ef..b32e92da7bc5 100644
--- a/puma-dev@.service
+++ b/user.service
@@ -2,10 +2,8 @@
After=network.target
[Service]
-User=%i
ExecStart=/usr/bin/puma-dev -sysbind
Restart=on-failure
-AmbientCapabilities=CAP_NET_BIND_SERVICE
[Install]
-WantedBy=multi-user.target \ No newline at end of file
+WantedBy=default.target \ No newline at end of file