0.10.3-1

* mark Caddyfile for backup
* combine disable and stop actions in pre_remove
* optionally check /etc/caddy/Envfile for additional configuration variables

4 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bc3244c35aa..5b0a3e319030 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun May 14 05:37:56 UTC 2017
+# Fri May 19 21:43:15 UTC 2017
 pkgbase = caddy-bin
 	pkgdesc = HTTP/2 web server with automatic HTTPS
-	pkgver = 0.10.2
+	pkgver = 0.10.3
 	pkgrel = 1
 	url = https://caddyserver.com
 	install = caddy.install
@@ -11,16 +11,16 @@ pkgbase = caddy-bin
 	provides = caddy
 	conflicts = caddy
 	backup = etc/caddy/Caddyfile
-	source = https://github.com/mholt/caddy/releases/download/v0.10.2/caddy_v0.10.2_linux_amd64.tar.gz
+	source = https://github.com/mholt/caddy/releases/download/v0.10.3/caddy_v0.10.3_linux_amd64.tar.gz
 	source = https://caddyserver.com/resources/images/brand/caddy-at-your-service-white.svg
 	source = index.html
 	source = caddy.service
 	source = caddy.tmpfiles
 	source = Caddyfile
-	sha256sums = de7b6a4301bdb5ae5c066e123d71efa9e73156878a43629ced45d8adfe5510c5
+	sha256sums = 94cd7cd5f04ce8b641abc3b5ec5c877b30ed346a098f6bd9831bcefb65725256
 	sha256sums = e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85
 	sha256sums = 6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7
-	sha256sums = 97ce7bfe38c268a7ffc316cc8b984eecb6aaac5b988384c9367b46e0ae0b8bff
+	sha256sums = c1d4d1f295177f0963583b7ad29e04afdf9f39f9e916be6135868a327fb37ef4
 	sha256sums = bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce
 	sha256sums = 4e30255be85d3b4f138860f61264aea3960d8873955d3a96eb8e39f1baf9aa65
 
diff --git a/PKGBUILD b/PKGBUILD
index 165d26e5df3e..5318b0b1ba36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,26 @@
 
 _name="caddy"
 pkgname="$_name-bin"
-pkgver=0.10.2
+pkgver=0.10.3
 pkgrel=1
-pkgdesc="HTTP/2 web server with automatic HTTPS"
-arch=("x86_64")
-url="https://caddyserver.com"
-license=("Apache")
+pkgdesc='HTTP/2 web server with automatic HTTPS'
+arch=('x86_64')
+url='https://caddyserver.com'
+license=('Apache')
+backup=('etc/caddy/Caddyfile')
 provides=("$_name")
 conflicts=("$_name")
-backup=("etc/caddy/Caddyfile")
-install="$_name.install"
+install='caddy.install'
 source=("https://github.com/mholt/caddy/releases/download/v$pkgver/caddy_v${pkgver}_linux_amd64.tar.gz"
         "https://caddyserver.com/resources/images/brand/caddy-at-your-service-white.svg"
         "index.html"
         "caddy.service"
         "caddy.tmpfiles"
         "Caddyfile")
-sha256sums=('de7b6a4301bdb5ae5c066e123d71efa9e73156878a43629ced45d8adfe5510c5'
+sha256sums=('94cd7cd5f04ce8b641abc3b5ec5c877b30ed346a098f6bd9831bcefb65725256'
             'e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85'
             '6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7'
-            '97ce7bfe38c268a7ffc316cc8b984eecb6aaac5b988384c9367b46e0ae0b8bff'
+            'c1d4d1f295177f0963583b7ad29e04afdf9f39f9e916be6135868a327fb37ef4'
             'bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce'
             '4e30255be85d3b4f138860f61264aea3960d8873955d3a96eb8e39f1baf9aa65')
 
diff --git a/caddy.install b/caddy.install
index f4d9695620e5..fa5b2fff3a46 100644
--- a/caddy.install
+++ b/caddy.install
@@ -8,8 +8,7 @@ post_upgrade() {
 }
 
 pre_remove() {
-    systemctl --quiet --no-reload disable caddy.service
-    systemctl --quiet stop caddy.service
+    systemctl --quiet --no-reload disable --now caddy.service
 }
 
 post_remove() {
diff --git a/caddy.service b/caddy.service
index 0fef32224108..cb67b1e9880e 100644
--- a/caddy.service
+++ b/caddy.service
@@ -7,6 +7,7 @@ After=network.target
 User=http
 Group=http
 Environment=CADDYPATH=/var/lib/caddy
+EnvironmentFile=-/etc/caddy/Envfile
 ExecStart=/usr/bin/caddy -log stdout -agree -conf /etc/caddy/Caddyfile -root /tmp
 ExecReload=/usr/bin/kill -USR1 $MAINPID
 LimitNOFILE=1048576