diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | caddy-api.service | 3 | ||||
| -rw-r--r-- | caddy.service | 3 |
4 files changed, 10 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = caddy2 pkgdesc = Fast web server with automatic HTTPS pkgver = 2.3.0 - pkgrel = 2 + pkgrel = 3 url = https://caddyserver.com arch = x86_64 license = Apache @@ -24,8 +24,8 @@ pkgbase = caddy2 validpgpkeys = 29D0817A67156E4F25DC24782A349DD577D586A5 sha512sums = SKIP sha512sums = 2abccd41f770daebf61285dc017249f20c707877ea3c870f4a2375bbbd2bf481a8652d1fd3c7afd7d6b5c54838e9d8474a33e2c9790ef67dcf9d79c4e52953b4 - sha512sums = efea5a97eac1d4d047c46f63fd23f5e23f86eb5b9d29b69bc544f024083b5af2f752b8104f756c2f26e6f0379954c3599d8ff8529dab5d2ca74e26a04ca44196 - sha512sums = eeb352e023331a3e3d88e47cc52f8786864abeb66bccc864d2557722afd54bdfcee9781590c3cf204923c8c0fa37029ba417a6a65ccd5569f8cbc214eb3ce642 + sha512sums = 6d1b5cdce02ed245c8b5f47f1fdbefdceed4876c5423dae8e87327dd7676ab466af5415923081f75391498c4c3b084c536f722eae010dfcecd8f87d3a4d53524 + sha512sums = 233a75386eec7582dd7d83b4c9653a491c4f9bbd18481d262bc81c8b9a1a0e5736bfada6bf07cad0d84be100dc3e15a608273cd9cbd4580eed123f8144030f0f sha512sums = 41d6b82ab99ca729d5b48d77d4557f3c5368b63847054216018547ea40e0cc302bc36668e9a57ba63e8983205febffee18eae1c306a665365a13da54010cd415 sha512sums = a9b3e4af421a4be0193d9a452cdf6b66b8f03fbf8bce3de4454a2ee70556c156c458b12a141fefb3e15a2acbb0f3acedc09cbccbecf82aa8916b9b6d799ec066 sha512sums = 6905c3ed603aef35889212d9c92d04967af64abbb777528a30996e8570b0716c6fb3fb2a5697d3df50e25c67ef0c9665b5e2b0e34fbae07dad002e54553bce58 @@ -7,7 +7,7 @@ _pkgname=caddy pkgver=2.3.0 _tag=v2.3.0 _distcommit='a509155e3cff18af793f6af5f930a71c89e05df8' -pkgrel=2 +pkgrel=3 pkgdesc="Fast web server with automatic HTTPS" arch=('x86_64') url="https://caddyserver.com" @@ -29,8 +29,8 @@ source=("git+https://github.com/caddyserver/caddy#tag=${_tag}?signed" Caddyfile) sha512sums=('SKIP' '2abccd41f770daebf61285dc017249f20c707877ea3c870f4a2375bbbd2bf481a8652d1fd3c7afd7d6b5c54838e9d8474a33e2c9790ef67dcf9d79c4e52953b4' - 'efea5a97eac1d4d047c46f63fd23f5e23f86eb5b9d29b69bc544f024083b5af2f752b8104f756c2f26e6f0379954c3599d8ff8529dab5d2ca74e26a04ca44196' - 'eeb352e023331a3e3d88e47cc52f8786864abeb66bccc864d2557722afd54bdfcee9781590c3cf204923c8c0fa37029ba417a6a65ccd5569f8cbc214eb3ce642' + '6d1b5cdce02ed245c8b5f47f1fdbefdceed4876c5423dae8e87327dd7676ab466af5415923081f75391498c4c3b084c536f722eae010dfcecd8f87d3a4d53524' + '233a75386eec7582dd7d83b4c9653a491c4f9bbd18481d262bc81c8b9a1a0e5736bfada6bf07cad0d84be100dc3e15a608273cd9cbd4580eed123f8144030f0f' '41d6b82ab99ca729d5b48d77d4557f3c5368b63847054216018547ea40e0cc302bc36668e9a57ba63e8983205febffee18eae1c306a665365a13da54010cd415' 'a9b3e4af421a4be0193d9a452cdf6b66b8f03fbf8bce3de4454a2ee70556c156c458b12a141fefb3e15a2acbb0f3acedc09cbccbecf82aa8916b9b6d799ec066' '6905c3ed603aef35889212d9c92d04967af64abbb777528a30996e8570b0716c6fb3fb2a5697d3df50e25c67ef0c9665b5e2b0e34fbae07dad002e54553bce58' diff --git a/caddy-api.service b/caddy-api.service index 53e1e22a3cac..80ebc063fc6c 100644 --- a/caddy-api.service +++ b/caddy-api.service @@ -20,6 +20,7 @@ User=caddy Group=caddy Environment=XDG_DATA_HOME=/var/lib Environment=XDG_CONFIG_HOME=/var/lib +EnvironmentFile=-/etc/caddy/envfile ExecStart=/usr/bin/caddy run --environ --resume # Do not allow the process to be restarted in a tight loop. If the @@ -49,4 +50,4 @@ ProtectControlGroups=true LockPersonality=true [Install] -WantedBy=multi-user.target
\ No newline at end of file +WantedBy=multi-user.target diff --git a/caddy.service b/caddy.service index 9d20460d047d..14c2d0fe6cf6 100644 --- a/caddy.service +++ b/caddy.service @@ -26,6 +26,7 @@ User=caddy Group=caddy Environment=XDG_DATA_HOME=/var/lib Environment=XDG_CONFIG_HOME=/var/lib/caddy/.config +EnvironmentFile=-/etc/caddy/envfile ExecStart=/usr/bin/caddy run --environ --config /etc/caddy/Caddyfile ExecReload=/usr/bin/caddy reload --config /etc/caddy/Caddyfile @@ -56,4 +57,4 @@ ProtectControlGroups=true LockPersonality=true [Install] -WantedBy=multi-user.target
\ No newline at end of file +WantedBy=multi-user.target |