diff options
author | carlwgeorge | 2017-06-03 01:29:24 -0500 |
---|---|---|
committer | carlwgeorge | 2017-06-03 01:29:24 -0500 |
commit | 5360be87922a2c89719bd60a98c620f0ead31072 (patch) | |
tree | 5ecde965a4061c5e0531b37f2f29ceb5130f244f | |
parent | 53f3e5023a0261f517b7e93848ccae109dff7149 (diff) | |
download | aur-5360be87922a2c89719bd60a98c620f0ead31072.tar.gz |
0.10.3-2
* rename Envfile to envfile
* rename Caddyfile to caddy.conf
* include additional configs from caddy.conf.d directory
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 31 | ||||
-rw-r--r-- | caddy.conf (renamed from Caddyfile) | 2 | ||||
-rw-r--r-- | caddy.service | 4 |
4 files changed, 26 insertions, 23 deletions
@@ -1,28 +1,28 @@ # Generated by mksrcinfo v8 -# Fri May 19 21:43:15 UTC 2017 +# Sat Jun 3 06:29:16 UTC 2017 pkgbase = caddy-bin pkgdesc = HTTP/2 web server with automatic HTTPS pkgver = 0.10.3 - pkgrel = 1 + pkgrel = 2 url = https://caddyserver.com install = caddy.install arch = x86_64 license = Apache provides = caddy conflicts = caddy - backup = etc/caddy/Caddyfile + backup = etc/caddy/caddy.conf 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 + source = caddy.conf sha256sums = 94cd7cd5f04ce8b641abc3b5ec5c877b30ed346a098f6bd9831bcefb65725256 sha256sums = e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85 sha256sums = 6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7 - sha256sums = c1d4d1f295177f0963583b7ad29e04afdf9f39f9e916be6135868a327fb37ef4 + sha256sums = 69e25def317a6172011472bd060655142f3085a0c81392f8a7a9c42b6a58bbd9 sha256sums = bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce - sha256sums = 4e30255be85d3b4f138860f61264aea3960d8873955d3a96eb8e39f1baf9aa65 + sha256sums = 80520b80ccabf077a3269f6a1bf55faa3811ef5adce115131b35ef2044d37b64 pkgname = caddy-bin @@ -3,33 +3,34 @@ _name="caddy" pkgname="$_name-bin" pkgver=0.10.3 -pkgrel=1 +pkgrel=2 pkgdesc='HTTP/2 web server with automatic HTTPS' arch=('x86_64') url='https://caddyserver.com' license=('Apache') -backup=('etc/caddy/Caddyfile') +backup=('etc/caddy/caddy.conf') provides=("$_name") conflicts=("$_name") 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") + 'https://caddyserver.com/resources/images/brand/caddy-at-your-service-white.svg' + 'index.html' + 'caddy.service' + 'caddy.tmpfiles' + 'caddy.conf') sha256sums=('94cd7cd5f04ce8b641abc3b5ec5c877b30ed346a098f6bd9831bcefb65725256' 'e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85' '6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7' - 'c1d4d1f295177f0963583b7ad29e04afdf9f39f9e916be6135868a327fb37ef4' + '69e25def317a6172011472bd060655142f3085a0c81392f8a7a9c42b6a58bbd9' 'bd4d912d083be176727882ccc1bbe577a27cc160db09238e5edc05ba458aebce' - '4e30255be85d3b4f138860f61264aea3960d8873955d3a96eb8e39f1baf9aa65') + '80520b80ccabf077a3269f6a1bf55faa3811ef5adce115131b35ef2044d37b64') 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 |