diff options
| -rw-r--r-- | .SRCINFO | 36 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | caddy-systemd-service.patch | 12 | ||||
| -rw-r--r-- | caddy_new.service | 4 | ||||
| -rw-r--r-- | caddy_old.service | 4 |
5 files changed, 43 insertions, 39 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Dec 2 10:25:12 UTC 2016 +# Wed Dec 21 23:23:09 UTC 2016 pkgbase = caddy-full-bin pkgdesc = A configurable, general-purpose HTTP/2 web server for any platform (All features enabled) - pkgver = 0.9.3 - pkgrel = 12 + pkgver = 0.9.4 + pkgrel = 1 url = https://caddyserver.com install = caddy-full-bin.install arch = i686 @@ -18,26 +18,26 @@ pkgbase = caddy-full-bin conflicts = caddy conflicts = caddy-git conflicts = caddy-all-features - source_i686 = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.3-3/caddy-all-plugins-0.9.3-3-386.tar.gz + source_i686 = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.4/caddy-all-plugins-0.9.4-386.tar.gz source_i686 = caddy-systemd-service.patch - md5sums_i686 = c6ef8d07cbdd41317d54de02a8d9f7cd - md5sums_i686 = 77e89ee90f6b69730b11ca83c7fbf48b - source_x86_64 = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.3-3/caddy-all-plugins-0.9.3-3-amd64.tar.gz + md5sums_i686 = be96e8b8ceddfee9b75e165326fca177 + md5sums_i686 = 3cf142fa66d9ab34804e50331d49e554 + source_x86_64 = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.4/caddy-all-plugins-0.9.4-amd64.tar.gz source_x86_64 = caddy-systemd-service.patch - md5sums_x86_64 = 9d228423b0276824fba70650bce06a15 - md5sums_x86_64 = 77e89ee90f6b69730b11ca83c7fbf48b - source_armv7h = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.3-3/caddy-all-plugins-0.9.3-3-arm.tar.gz + md5sums_x86_64 = 3fee8f6183e7853a23df024e2d73e640 + md5sums_x86_64 = 3cf142fa66d9ab34804e50331d49e554 + source_armv7h = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.4/caddy-all-plugins-0.9.4-arm.tar.gz source_armv7h = caddy-systemd-service.patch - md5sums_armv7h = 8bdf9487023d656a49093fb1456b4ed7 - md5sums_armv7h = 77e89ee90f6b69730b11ca83c7fbf48b - source_aarch64 = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.3-3/caddy-all-plugins-0.9.3-3-arm.tar.gz + md5sums_armv7h = ad5675e7ae93fba597d2cc85eec1550c + md5sums_armv7h = 3cf142fa66d9ab34804e50331d49e554 + source_aarch64 = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.4/caddy-all-plugins-0.9.4-arm.tar.gz source_aarch64 = caddy-systemd-service.patch - md5sums_aarch64 = 8bdf9487023d656a49093fb1456b4ed7 - md5sums_aarch64 = 77e89ee90f6b69730b11ca83c7fbf48b - source_armv6h = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.3-3/caddy-all-plugins-0.9.3-3-arm6.tar.gz + md5sums_aarch64 = ad5675e7ae93fba597d2cc85eec1550c + md5sums_aarch64 = 3cf142fa66d9ab34804e50331d49e554 + source_armv6h = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.4/caddy-all-plugins-0.9.4-arm6.tar.gz source_armv6h = caddy-systemd-service.patch - md5sums_armv6h = 7e5eeaa4a9b10f0fc677669456c260c9 - md5sums_armv6h = 77e89ee90f6b69730b11ca83c7fbf48b + md5sums_armv6h = de9c236cef6c1447f9c60f60890723f2 + md5sums_armv6h = 3cf142fa66d9ab34804e50331d49e554 pkgname = caddy-full-bin @@ -5,9 +5,9 @@ pkgname=caddy-full-bin _realname=caddy -pkgver=0.9.3 -ghpkgrel='-3' -pkgrel=12 +pkgver=0.9.4 +ghpkgrel='' +pkgrel=1 pkgdesc="A configurable, general-purpose HTTP/2 web server for any platform (All features enabled)" arch=('i686' 'x86_64' 'armv7h' 'aarch64' 'armv6h') url="https://caddyserver.com" @@ -16,16 +16,16 @@ provides=('caddy') conflicts=('caddy' 'caddy-git' 'caddy-all-features') depends=('systemd>=229') makedepends=('patch') -md5sums_i686=('c6ef8d07cbdd41317d54de02a8d9f7cd' - '77e89ee90f6b69730b11ca83c7fbf48b') -md5sums_x86_64=('9d228423b0276824fba70650bce06a15' - '77e89ee90f6b69730b11ca83c7fbf48b') -md5sums_armv7h=('8bdf9487023d656a49093fb1456b4ed7' - '77e89ee90f6b69730b11ca83c7fbf48b') -md5sums_aarch64=('8bdf9487023d656a49093fb1456b4ed7' - '77e89ee90f6b69730b11ca83c7fbf48b') -md5sums_armv6h=('7e5eeaa4a9b10f0fc677669456c260c9' - '77e89ee90f6b69730b11ca83c7fbf48b') +md5sums_i686=('be96e8b8ceddfee9b75e165326fca177' + '3cf142fa66d9ab34804e50331d49e554') +md5sums_x86_64=('3fee8f6183e7853a23df024e2d73e640' + '3cf142fa66d9ab34804e50331d49e554') +md5sums_armv7h=('ad5675e7ae93fba597d2cc85eec1550c' + '3cf142fa66d9ab34804e50331d49e554') +md5sums_aarch64=('ad5675e7ae93fba597d2cc85eec1550c' + '3cf142fa66d9ab34804e50331d49e554') +md5sums_armv6h=('de9c236cef6c1447f9c60f60890723f2' + '3cf142fa66d9ab34804e50331d49e554') install='caddy-full-bin.install' source_i686=("https://github.com/klingtnet/caddy-release-downloader/releases/download/${pkgver}${ghpkgrel}/caddy-all-plugins-${pkgver}${ghpkgrel}-386.tar.gz" "caddy-systemd-service.patch") diff --git a/caddy-systemd-service.patch b/caddy-systemd-service.patch index 8ed422217346..e7539d9dc5bf 100644 --- a/caddy-systemd-service.patch +++ b/caddy-systemd-service.patch @@ -1,7 +1,7 @@ ---- caddy_old.service 2016-09-29 18:04:15.356244279 +0200 -+++ caddy_new.service 2016-09-29 18:04:15.356244279 +0200 -@@ -8,14 +8,14 @@ - Restart=on-failure +--- caddy_old.service 2016-12-22 00:10:37.749475603 +0100 ++++ caddy_new.service 2016-12-22 00:11:15.758066472 +0100 +@@ -10,14 +10,14 @@ + StartLimitBurst=5 ; User and group the process will run as. -User=www-data @@ -10,7 +10,7 @@ +Group=http ; Letsencrypt-issued certificates will be written to this directory. - Environment=HOME=/etc/ssl/caddy + Environment=CADDYPATH=/etc/ssl/caddy ; Always set "-root" to something safe in case it gets forgotten in the Caddyfile. -ExecStart=/usr/local/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp @@ -18,7 +18,7 @@ ExecReload=/bin/kill -USR1 $MAINPID ; Limit the number of file descriptors; see `man systemd.exec` for more limit settings. -@@ -38,9 +38,9 @@ +@@ -40,9 +40,9 @@ ; The following additional security directives only work with systemd v229 or later. ; They further retrict privileges that can be gained by caddy. Uncomment if you like. ; Note that you may have to add capabilities required by any plugins in use. diff --git a/caddy_new.service b/caddy_new.service index eed5b4fba9fd..d46b27f585ee 100644 --- a/caddy_new.service +++ b/caddy_new.service @@ -6,13 +6,15 @@ Wants=network-online.target systemd-networkd-wait-online.service [Service] Restart=on-failure +StartLimitInterval=86400 +StartLimitBurst=5 ; User and group the process will run as. User=http Group=http ; Letsencrypt-issued certificates will be written to this directory. -Environment=HOME=/etc/ssl/caddy +Environment=CADDYPATH=/etc/ssl/caddy ; Always set "-root" to something safe in case it gets forgotten in the Caddyfile. ExecStart=/usr/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp diff --git a/caddy_old.service b/caddy_old.service index 536cb3a192f5..3bc368b917d5 100644 --- a/caddy_old.service +++ b/caddy_old.service @@ -6,13 +6,15 @@ Wants=network-online.target systemd-networkd-wait-online.service [Service] Restart=on-failure +StartLimitInterval=86400 +StartLimitBurst=5 ; User and group the process will run as. User=www-data Group=www-data ; Letsencrypt-issued certificates will be written to this directory. -Environment=HOME=/etc/ssl/caddy +Environment=CADDYPATH=/etc/ssl/caddy ; Always set "-root" to something safe in case it gets forgotten in the Caddyfile. ExecStart=/usr/local/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp |