diff options
| author | heimoshuiyu | 2021-10-12 23:27:51 +0800 |
|---|---|---|
| committer | heimoshuiyu | 2021-10-12 23:27:51 +0800 |
| commit | 97632569ec95782cacf75f4f77ee0f035c95d80c (patch) | |
| tree | cb6b14fd22f93e81390a7ebb304098443f0c4bff | |
| parent | cef2567ce484c835e48748bda0216516df47f2c7 (diff) | |
| download | aur-97632569ec95782cacf75f4f77ee0f035c95d80c.tar.gz | |
Fix: systemd user permission problem
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | caddy.service | 4 | ||||
| -rw-r--r-- | sysusers-caddy.conf | 1 | ||||
| -rw-r--r-- | tmpfiles-caddy.conf | 3 |
4 files changed, 16 insertions, 4 deletions
@@ -15,10 +15,16 @@ backup=('etc/caddy/Caddyfile') source=("caddy::git://github.com/caddyserver/caddy" "Caddyfile" - "caddy.service") + "caddy.service" + "sysusers-caddy.conf" + "tmpfiles-caddy.conf" +) sha256sums=('SKIP' '2bcb3cc1e19cec630ea64c014bba5463d49c45a2712d1107d1d10e87d3c023c6' - '7c5cd88ac3a35e3cb5f467118bcf0dac896aba00945ce1566df710c09bf985c2') + '8ba0cb8356921d6a84ad39a81908c433906d9dbf9381a68778fefaa681af7309' + 'a9294eeba17a8fd57cf11cef21e2eb3719a016646eeac0764a0d9f9f380a40ef' + '654720ba129d7506676df0923737df513c2a438e6141dafbac66c61e4c1c04a0' + ) pkgver() { @@ -52,4 +58,6 @@ package() { install -D -m 0755 caddy/cmd/caddy/caddy "${pkgdir}/usr/bin/caddy" install -D -m 0644 caddy.service "${pkgdir}/usr/lib/systemd/system/caddy.service" install -D -m 0644 Caddyfile "${pkgdir}/etc/caddy/Caddyfile" + install -D -m 0644 tmpfiles-caddy.conf "${pkgdir}/usr/lib/tmpfiles.d/caddy.conf" + install -D -m 0644 sysusers-caddy.conf "${pkgdir}/usr/lib/sysusers.d/caddy.conf" } diff --git a/caddy.service b/caddy.service index a35be2b03be7..a36be7bab93e 100644 --- a/caddy.service +++ b/caddy.service @@ -22,8 +22,8 @@ StartLimitIntervalSec=14400 StartLimitBurst=10 [Service] -User=http -Group=http +User=caddy +Group=caddy Environment=XDG_DATA_HOME=/var/lib Environment=XDG_CONFIG_HOME=/etc ExecStartPre=/usr/bin/caddy validate --config /etc/caddy/Caddyfile diff --git a/sysusers-caddy.conf b/sysusers-caddy.conf new file mode 100644 index 000000000000..6fb563371e7e --- /dev/null +++ b/sysusers-caddy.conf @@ -0,0 +1 @@ +u caddy - "caddy daemon" /var/lib/caddy diff --git a/tmpfiles-caddy.conf b/tmpfiles-caddy.conf new file mode 100644 index 000000000000..25f170fbbd69 --- /dev/null +++ b/tmpfiles-caddy.conf @@ -0,0 +1,3 @@ +d /var/lib/caddy 0750 caddy caddy +d /var/log/caddy 0750 caddy caddy +d /run/caddy 0750 caddy caddy |