diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | caddy.service | 15 |
3 files changed, 6 insertions, 24 deletions
@@ -1,7 +1,7 @@ pkgbase = caddy pkgdesc = A configurable, general-purpose HTTP/2 web server for any platform pkgver = 0.8.3 - pkgrel = 1 + pkgrel = 2 url = https://caddyserver.com install = caddy.install arch = i686 @@ -11,8 +11,6 @@ pkgbase = caddy license = Apache conflicts = caddy conflicts = caddy-git - source = caddy.service - sha256sums = 244fa03febae623f1b10adfb6883a9573ba81747b8e535bb23101ab230ccbf95 source_i686 = https://github.com/mholt/caddy/releases/download/v0.8.3/caddy_linux_386.tar.gz sha256sums_i686 = 25b173dc2f47bd22c48efb6831c713f3100c9d70a04d69f81bc3dc236abc7624 source_x86_64 = https://github.com/mholt/caddy/releases/download/v0.8.3/caddy_linux_amd64.tar.gz @@ -3,7 +3,7 @@ pkgname=caddy pkgver=0.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="A configurable, general-purpose HTTP/2 web server for any platform" arch=('i686' 'x86_64' 'armv7h' 'aarch64') url="https://caddyserver.com" @@ -11,9 +11,6 @@ license=('Apache') install='caddy.install' conflicts=('caddy' 'caddy-git') -source=('caddy.service') -sha256sums=('244fa03febae623f1b10adfb6883a9573ba81747b8e535bb23101ab230ccbf95') - source_i686=("https://github.com/mholt/caddy/releases/download/v$pkgver/caddy_linux_386.tar.gz") sha256sums_i686=('25b173dc2f47bd22c48efb6831c713f3100c9d70a04d69f81bc3dc236abc7624') @@ -27,6 +24,8 @@ source_aarch64=("https://github.com/mholt/caddy/releases/download/v$pkgver/caddy sha256sums_aarch64=('766f2a358e9d057e9b112ea91e83467c2b339ef1cf2488c6a1e0749511c8e3d7') package() { - install -Dm755 "$srcdir/caddy" "$pkgdir/usr/bin/caddy" - install -Dm644 "${srcdir}/caddy.service" "${pkgdir}/usr/lib/systemd/system/caddy.service" + rm -f "${srcdir}/"*.tar.gz + install -Dm755 "$srcdir/"caddy_linux_* "$pkgdir/usr/bin/caddy" + install -Dm644 "${srcdir}/init/linux-systemd/caddy@.service" "${pkgdir}/usr/lib/systemd/system/caddy@.service" + install -Dm644 "${srcdir}/init/linux-systemd/README.md" "${pkgdir}/usr/share/doc/caddy/systemd-service.md" } diff --git a/caddy.service b/caddy.service deleted file mode 100644 index 3b73b3123b31..000000000000 --- a/caddy.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=A general-purpose HTTP/2 web server -After=network.target nss-lookup.target - -[Service] -Type=simple -User=http -Group=http -PrivateTmp=true -LimitNOFILE=8192 -ExecStart=/usr/bin/caddy -conf="/etc/caddy/caddy.conf" -host="::" -port="80" -Restart=always - -[Install] -WantedBy=multi-user.target |