summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Linz2017-01-24 23:14:49 +0100
committerAndreas Linz2017-01-24 23:14:49 +0100
commitf07f6c9878768f9c49f41c3121b7d4e2ab14699a (patch)
tree6dd2ec4d947f0d770e32cfdf1f82e1743b2469f6
parent0dd66bcc09cb8cd62b772cedd4430d1769fa9825 (diff)
downloadaur-f07f6c9878768f9c49f41c3121b7d4e2ab14699a.tar.gz
Update to caddy 0.9.5
The package will print a warning because of a changed header directive and two redundant files will be removed.
-rw-r--r--.SRCINFO34
-rw-r--r--PKGBUILD27
-rw-r--r--caddy-systemd-service.patch5
-rw-r--r--caddy_new.service48
-rw-r--r--caddy_old.service48
5 files changed, 36 insertions, 126 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d4e97096b18..09b06032fe8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Dec 21 23:23:09 UTC 2016
+# Tue Jan 24 22:12:32 UTC 2017
pkgbase = caddy-full-bin
pkgdesc = A configurable, general-purpose HTTP/2 web server for any platform (All features enabled)
- pkgver = 0.9.4
+ pkgver = 0.9.5
pkgrel = 1
url = https://caddyserver.com
install = caddy-full-bin.install
@@ -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.4/caddy-all-plugins-0.9.4-386.tar.gz
+ source_i686 = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.5/caddy-all-plugins-0.9.5-386.tar.gz
source_i686 = caddy-systemd-service.patch
- 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
+ md5sums_i686 = d46efb5859d84f1ce90042609d3f167a
+ md5sums_i686 = ce5f9e54ab24ce0598da6c909995be9a
+ source_x86_64 = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.5/caddy-all-plugins-0.9.5-amd64.tar.gz
source_x86_64 = caddy-systemd-service.patch
- 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
+ md5sums_x86_64 = bd0262fee1ddc864b958cc59638b62b8
+ md5sums_x86_64 = ce5f9e54ab24ce0598da6c909995be9a
+ source_armv7h = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.5/caddy-all-plugins-0.9.5-arm.tar.gz
source_armv7h = caddy-systemd-service.patch
- 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
+ md5sums_armv7h = 300f93bfd1856ddcfb67e3fd106bebb5
+ md5sums_armv7h = ce5f9e54ab24ce0598da6c909995be9a
+ source_aarch64 = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.5/caddy-all-plugins-0.9.5-arm.tar.gz
source_aarch64 = caddy-systemd-service.patch
- 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
+ md5sums_aarch64 = 300f93bfd1856ddcfb67e3fd106bebb5
+ md5sums_aarch64 = ce5f9e54ab24ce0598da6c909995be9a
+ source_armv6h = https://github.com/klingtnet/caddy-release-downloader/releases/download/0.9.5/caddy-all-plugins-0.9.5-arm6.tar.gz
source_armv6h = caddy-systemd-service.patch
- md5sums_armv6h = de9c236cef6c1447f9c60f60890723f2
- md5sums_armv6h = 3cf142fa66d9ab34804e50331d49e554
+ md5sums_armv6h = 59fddb37886c3bacd1fd10635b6c35d2
+ md5sums_armv6h = ce5f9e54ab24ce0598da6c909995be9a
pkgname = caddy-full-bin
diff --git a/PKGBUILD b/PKGBUILD
index dc79df10d7a..841321998ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=caddy-full-bin
_realname=caddy
-pkgver=0.9.4
+pkgver=0.9.5
ghpkgrel=''
pkgrel=1
pkgdesc="A configurable, general-purpose HTTP/2 web server for any platform (All features enabled)"
@@ -16,16 +16,16 @@ provides=('caddy')
conflicts=('caddy' 'caddy-git' 'caddy-all-features')
depends=('systemd>=229')
makedepends=('patch')
-md5sums_i686=('be96e8b8ceddfee9b75e165326fca177'
- '3cf142fa66d9ab34804e50331d49e554')
-md5sums_x86_64=('3fee8f6183e7853a23df024e2d73e640'
- '3cf142fa66d9ab34804e50331d49e554')
-md5sums_armv7h=('ad5675e7ae93fba597d2cc85eec1550c'
- '3cf142fa66d9ab34804e50331d49e554')
-md5sums_aarch64=('ad5675e7ae93fba597d2cc85eec1550c'
- '3cf142fa66d9ab34804e50331d49e554')
-md5sums_armv6h=('de9c236cef6c1447f9c60f60890723f2'
- '3cf142fa66d9ab34804e50331d49e554')
+md5sums_i686=('d46efb5859d84f1ce90042609d3f167a'
+ 'ce5f9e54ab24ce0598da6c909995be9a')
+md5sums_x86_64=('bd0262fee1ddc864b958cc59638b62b8'
+ 'ce5f9e54ab24ce0598da6c909995be9a')
+md5sums_armv7h=('300f93bfd1856ddcfb67e3fd106bebb5'
+ 'ce5f9e54ab24ce0598da6c909995be9a')
+md5sums_aarch64=('300f93bfd1856ddcfb67e3fd106bebb5'
+ 'ce5f9e54ab24ce0598da6c909995be9a')
+md5sums_armv6h=('59fddb37886c3bacd1fd10635b6c35d2'
+ 'ce5f9e54ab24ce0598da6c909995be9a')
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")
@@ -45,4 +45,9 @@ package() {
install -Dm644 "${srcdir}/init/linux-systemd/README.md" "${pkgdir}/usr/share/doc/${_realname}/service.txt"
install -Dm644 "${srcdir}/LICENSES.txt" "${pkgdir}/usr/share/licenses/${_realname}/LICENSE"
install -Dm644 "${srcdir}/README.txt" "${pkgdir}/usr/share/doc/${_realgname}/README.md"
+ cat <<HEREDOC
+NOTE: The 'proxy_header' directive is deprectated and now called 'header_upstream'!
+Use 'caddy -validate -conf=/path/to/config' to check your config BEFORE restarting the service!
+For further details refer to the official release notes: https://github.com/mholt/caddy/releases/tag/v0.9.5
+HEREDOC
}
diff --git a/caddy-systemd-service.patch b/caddy-systemd-service.patch
index e7539d9dc5b..b921c6982b4 100644
--- a/caddy-systemd-service.patch
+++ b/caddy-systemd-service.patch
@@ -1,5 +1,6 @@
---- caddy_old.service 2016-12-22 00:10:37.749475603 +0100
-+++ caddy_new.service 2016-12-22 00:11:15.758066472 +0100
+diff -aur init.pristine/linux-systemd/caddy.service init.new/linux-systemd/caddy.service
+--- init.pristine/linux-systemd/caddy.service 2017-01-24 22:53:51.936956151 +0100
++++ init.new/linux-systemd/caddy.service 2017-01-24 22:55:11.580292966 +0100
@@ -10,14 +10,14 @@
StartLimitBurst=5
diff --git a/caddy_new.service b/caddy_new.service
deleted file mode 100644
index d46b27f585e..00000000000
--- a/caddy_new.service
+++ /dev/null
@@ -1,48 +0,0 @@
-[Unit]
-Description=Caddy HTTP/2 web server
-Documentation=https://caddyserver.com/docs
-After=network-online.target
-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=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
-ExecReload=/bin/kill -USR1 $MAINPID
-
-; Limit the number of file descriptors; see `man systemd.exec` for more limit settings.
-LimitNOFILE=1048576
-; Unmodified caddy is not expected to use more than that.
-LimitNPROC=64
-
-; Use private /tmp and /var/tmp, which are discarded after caddy stops.
-PrivateTmp=true
-; Use a minimal /dev
-PrivateDevices=true
-; Hide /home, /root, and /run/user. Nobody will steal your SSH-keys.
-ProtectHome=true
-; Make /usr, /boot, /etc and possibly some more folders read-only.
-ProtectSystem=full
-; … except /etc/ssl/caddy, because we want Letsencrypt-certificates there.
-; This merely retains r/w access rights, it does not add any new. Must still be writable on the host!
-ReadWriteDirectories=/etc/ssl/caddy
-
-; 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.
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/caddy_old.service b/caddy_old.service
deleted file mode 100644
index 3bc368b917d..00000000000
--- a/caddy_old.service
+++ /dev/null
@@ -1,48 +0,0 @@
-[Unit]
-Description=Caddy HTTP/2 web server
-Documentation=https://caddyserver.com/docs
-After=network-online.target
-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=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
-ExecReload=/bin/kill -USR1 $MAINPID
-
-; Limit the number of file descriptors; see `man systemd.exec` for more limit settings.
-LimitNOFILE=1048576
-; Unmodified caddy is not expected to use more than that.
-LimitNPROC=64
-
-; Use private /tmp and /var/tmp, which are discarded after caddy stops.
-PrivateTmp=true
-; Use a minimal /dev
-PrivateDevices=true
-; Hide /home, /root, and /run/user. Nobody will steal your SSH-keys.
-ProtectHome=true
-; Make /usr, /boot, /etc and possibly some more folders read-only.
-ProtectSystem=full
-; … except /etc/ssl/caddy, because we want Letsencrypt-certificates there.
-; This merely retains r/w access rights, it does not add any new. Must still be writable on the host!
-ReadWriteDirectories=/etc/ssl/caddy
-
-; 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.
-;CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-;AmbientCapabilities=CAP_NET_BIND_SERVICE
-;NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target