summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorcarlwgeorge2017-09-11 08:38:22 -0500
committercarlwgeorge2017-09-11 08:38:22 -0500
commit677cf1cdd73226939a5bd3685fb2837ee2e87858 (patch)
tree99a81167a5ce58d68709dca6f7ebb74ba493af83
parent20cfa9777cc6e266ac1e16d53defb1ef34562a9c (diff)
downloadaur-677cf1cdd73226939a5bd3685fb2837ee2e87858.tar.gz
0.10.8-1
* move sub-configs to conf.d/*.conf
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--caddy.conf2
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a1e68e246eb3..92f6d03ec68c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Sep 5 12:46:53 UTC 2017
+# Mon Sep 11 13:32:30 UTC 2017
pkgbase = caddy-bin
pkgdesc = HTTP/2 web server with automatic HTTPS
- pkgver = 0.10.7
+ pkgver = 0.10.8
pkgrel = 1
url = https://caddyserver.com
install = caddy.install
@@ -11,13 +11,13 @@ pkgbase = caddy-bin
provides = caddy
conflicts = caddy
backup = etc/caddy/caddy.conf
- source = https://github.com/mholt/caddy/releases/download/v0.10.7/caddy_v0.10.7_linux_amd64.tar.gz
+ source = https://github.com/mholt/caddy/releases/download/v0.10.8/caddy_v0.10.8_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 = caddy.conf
- sha256sums = f41a2b031887c21869de935d2af3053127c8f29df4583aab70783accd258769e
+ sha256sums = 91fa1d4d415ab585bf8d641a6fd374707ab2b9b28cbf11bd7740b4ba4a6795bb
sha256sums = e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85
sha256sums = 6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7
sha256sums = 69e25def317a6172011472bd060655142f3085a0c81392f8a7a9c42b6a58bbd9
diff --git a/PKGBUILD b/PKGBUILD
index c6842c2aa25b..e62efe54c127 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_name="caddy"
pkgname="$_name-bin"
-pkgver=0.10.7
+pkgver=0.10.8
pkgrel=1
pkgdesc='HTTP/2 web server with automatic HTTPS'
arch=('x86_64')
@@ -18,7 +18,7 @@ source=("https://github.com/mholt/caddy/releases/download/v$pkgver/caddy_v${pkgv
'caddy.service'
'caddy.tmpfiles'
'caddy.conf')
-sha256sums=('f41a2b031887c21869de935d2af3053127c8f29df4583aab70783accd258769e'
+sha256sums=('91fa1d4d415ab585bf8d641a6fd374707ab2b9b28cbf11bd7740b4ba4a6795bb'
'e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85'
'6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7'
'69e25def317a6172011472bd060655142f3085a0c81392f8a7a9c42b6a58bbd9'
@@ -32,5 +32,5 @@ package() {
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"
+ install -d -m 0755 "$pkgdir/etc/caddy/conf.d"
}
diff --git a/caddy.conf b/caddy.conf
index 47e514afce4d..de235518ae5b 100644
--- a/caddy.conf
+++ b/caddy.conf
@@ -3,4 +3,4 @@
root /usr/share/caddy
}
-import caddy.conf.d/*.conf
+import conf.d/*.conf