0.10.3-2

* rename Envfile to envfile
* rename Caddyfile to caddy.conf
* include additional configs from caddy.conf.d directory

4 files changed, 22 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 506abeb34e07..92efbbf7c1f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri May 19 21:53:35 UTC 2017
+# Sat Jun  3 06:19:04 UTC 2017
 pkgbase = caddy
 	pkgdesc = HTTP/2 web server with automatic HTTPS
 	pkgver = 0.10.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://caddyserver.com
 	install = caddy.install
 	arch = i686
@@ -13,20 +13,20 @@ pkgbase = caddy
 	license = Apache
 	makedepends = go>=1.8.1
 	makedepends = git
-	backup = etc/caddy/Caddyfile
+	backup = etc/caddy/caddy.conf
 	source = https://github.com/mholt/caddy/archive/v0.10.3/caddy-0.10.3.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
+	source = caddy.conf
 	source = enable-dnsproviders.patch
 	sha256sums = fbbecb2eed383fd9deb9177f899ba8c8ebf15f767f4fefa0cc558f07ed337260
 	sha256sums = e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85
 	sha256sums = 6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7
-	sha256sums = c1d4d1f295177f0963583b7ad29e04afdf9f39f9e916be6135868a327fb37ef4
+	sha256sums = 69e25def317a6172011472bd060655142f3085a0c81392f8a7a9c42b6a58bbd9
 	sha256sums = bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce
-	sha256sums = 4e30255be85d3b4f138860f61264aea3960d8873955d3a96eb8e39f1baf9aa65
+	sha256sums = 80520b80ccabf077a3269f6a1bf55faa3811ef5adce115131b35ef2044d37b64
 	sha256sums = 158c9a0f4327384c244846badc5295eab2a4cf16c354a3669fc0cce1c34e4a91
 
 pkgname = caddy
diff --git a/PKGBUILD b/PKGBUILD
index daf13324756f..7ca2e9ee2bfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,12 +8,12 @@ _import="$_provider.$_tld/$_project/$_repo"
 
 pkgname=caddy
 pkgver=0.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc='HTTP/2 web server with automatic HTTPS'
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url='https://caddyserver.com'
 license=('Apache')
-backup=('etc/caddy/Caddyfile')
+backup=('etc/caddy/caddy.conf')
 install='caddy.install'
 makedepends=('go>=1.8.1' 'git')
 source=("https://$_import/archive/v$pkgver/$_repo-$pkgver.tar.gz"
@@ -21,14 +21,14 @@ source=("https://$_import/archive/v$pkgver/$_repo-$pkgver.tar.gz"
         'index.html'
         'caddy.service'
         'caddy.tmpfiles'
-        'Caddyfile'
+        'caddy.conf'
         'enable-dnsproviders.patch')
 sha256sums=('fbbecb2eed383fd9deb9177f899ba8c8ebf15f767f4fefa0cc558f07ed337260'
             'e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85'
             '6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7'
-            'c1d4d1f295177f0963583b7ad29e04afdf9f39f9e916be6135868a327fb37ef4'
+            '69e25def317a6172011472bd060655142f3085a0c81392f8a7a9c42b6a58bbd9'
             'bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce'
-            '4e30255be85d3b4f138860f61264aea3960d8873955d3a96eb8e39f1baf9aa65'
+            '80520b80ccabf077a3269f6a1bf55faa3811ef5adce115131b35ef2044d37b64'
             '158c9a0f4327384c244846badc5295eab2a4cf16c354a3669fc0cce1c34e4a91')
 
 prepare() {
@@ -46,10 +46,11 @@ build() {
 }
 
 package() {
-    install --verbose -D --mode 0755 caddy "$pkgdir/usr/bin/caddy"
-    install --verbose -D --mode 0644 caddy.service "$pkgdir/usr/lib/systemd/system/caddy.service"
-    install --verbose -D --mode 0644 caddy.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/caddy.conf"
-    install --verbose -D --mode 0644 Caddyfile "$pkgdir/etc/caddy/Caddyfile"
-    install --verbose -D --mode 0644 index.html "$pkgdir/usr/share/caddy/index.html"
-    install --verbose -D --mode 0644 caddy-at-your-service-white.svg "$pkgdir/usr/share/caddy/caddy-at-your-service-white.svg"
+    install -D -m 0755 caddy "$pkgdir/usr/bin/caddy"
+    install -D -m 0644 caddy-at-your-service-white.svg "$pkgdir/usr/share/caddy/caddy-at-your-service-white.svg"
+    install -D -m 0644 index.html "$pkgdir/usr/share/caddy/index.html"
+    install -D -m 0644 caddy.service "$pkgdir/usr/lib/systemd/system/caddy.service"
+    install -D -m 0644 caddy.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/caddy.conf"
+    install -D -m 0644 caddy.conf "$pkgdir/etc/caddy/caddy.conf"
+    install -d -m 0755 "$pkgdir/etc/caddy/caddy.conf.d"
 }
diff --git a/Caddyfile b/caddy.conf
index 10de8e20e6c0..21dc6f367958 100644
--- a/Caddyfile
+++ b/caddy.conf
@@ -2,3 +2,5 @@
 	gzip
 	root /usr/share/caddy
 }
+
+import caddy.conf.d/*.conf
diff --git a/caddy.service b/caddy.service
index cb67b1e9880e..60b7fc5be47b 100644
--- a/caddy.service
+++ b/caddy.service
@@ -7,8 +7,8 @@ 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
+EnvironmentFile=-/etc/caddy/envfile
+ExecStart=/usr/bin/caddy -log stdout -agree -conf /etc/caddy/caddy.conf -root /tmp
 ExecReload=/usr/bin/kill -USR1 $MAINPID
 LimitNOFILE=1048576
 LimitNPROC=64