[arch-commits] Commit in caddy/trunk/next (Caddyfile PKGBUILD caddy.conf)

[Levente Polyak]

    Date: Thursday, February 11, 2021 @ 19:38:27
  Author: anthraxx
Revision: 856774

update GOFLAGS and bump version to v2.3.0

Added:
  caddy/trunk/next/Caddyfile
Modified:
  caddy/trunk/next/PKGBUILD
Deleted:
  caddy/trunk/next/caddy.conf

------------+
 Caddyfile  |   28 ++++++++++++++++++++++++++++
 PKGBUILD   |   13 ++++++-------
 caddy.conf |   28 ----------------------------
 3 files changed, 34 insertions(+), 35 deletions(-)

Added: Caddyfile
===================================================================
--- Caddyfile	                        (rev 0)
+++ Caddyfile	2021-02-11 19:38:27 UTC (rev 856774)
@@ -0,0 +1,28 @@
+# The Caddyfile is an easy way to configure your Caddy web server.
+#
+# Unless the file starts with a global options block, the first
+# uncommented line is always the address of your site.
+#
+# To use your own domain name (with automatic HTTPS), first make
+# sure your domain's A/AAAA DNS records are properly pointed to
+# this machine's public IP, then replace the line below with your
+# domain name.
+:80
+
+# Set this path to your site's directory.
+root * /usr/share/caddy
+
+# Enable the static file server.
+file_server
+
+# Import additional caddy config files in /etc/caddy/conf.d/
+import /etc/caddy/conf.d/*
+
+# Another common task is to set up a reverse proxy:
+# reverse_proxy localhost:8080
+
+# Or serve a PHP site through php-fpm:
+# php_fastcgi localhost:9000
+
+# Refer to the Caddy docs for more information:
+# https://github.com/caddyserver/caddy/wiki/v2:-Documentation

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-11 19:29:48 UTC (rev 856773)
+++ PKGBUILD	2021-02-11 19:38:27 UTC (rev 856774)
@@ -7,8 +7,8 @@
 # Contributor: Akshay S Dinesh <asdofindia at gmail dot com>
 
 pkgname=caddy
-pkgver=2.0.0
-_gitcommit=1b0ed34f8117a6a1ccd769636f95ae84f4d1b9ab
+pkgver=2.3.0
+_gitcommit=b4989773ebb2dff21283ee50ec667f9138bdd292
 pkgrel=1
 pkgdesc='Fast web server with automatic HTTPS'
 url='https://caddyserver.com'
@@ -16,7 +16,7 @@
 license=('Apache')
 depends=('glibc')
 makedepends=('go' 'git')
-backup=('etc/caddy/caddy.conf')
+backup=('etc/caddy/Caddyfile')
 source=("git+https://github.com/caddyserver/caddy#tag=${_gitcommit}?signed"
         index.html
         caddy.service
@@ -23,7 +23,7 @@
         caddy-api.service
         caddy.tmpfiles
         caddy.sysusers
-        caddy.conf)
+        Caddyfile)
 sha512sums=('SKIP'
             '2abccd41f770daebf61285dc017249f20c707877ea3c870f4a2375bbbd2bf481a8652d1fd3c7afd7d6b5c54838e9d8474a33e2c9790ef67dcf9d79c4e52953b4'
             '8a9cf23bbc3ea34a5b163804cba6d7485040cc68b562cab29383680aa8c885d85ad14fa516b581a7d16443a2debb5005f92c3f27a1b21a53f8063ed9636de822'
@@ -42,7 +42,6 @@
 
 prepare() {
   sed 's|/var/www/html|/srv/http|g' -i "${srcdir}/index.html"
-  sed 's|/etc/caddy/Caddyfile|/etc/caddy/caddy.conf|g' -i "${srcdir}/index.html"
 }
 
 build() {
@@ -51,7 +50,7 @@
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
   go build .
 }
 
@@ -67,7 +66,7 @@
   install -Dm 644 "${srcdir}/caddy-api.service" -t "${pkgdir}/usr/lib/systemd/system"
   install -Dm 644 "${srcdir}/caddy.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/caddy.conf"
   install -Dm 644 "${srcdir}/caddy.sysusers" "${pkgdir}/usr/lib/sysusers.d/caddy.conf"
-  install -Dm 644 "${srcdir}/caddy.conf" "${pkgdir}/etc/caddy/caddy.conf"
+  install -Dm 644 "${srcdir}/Caddyfile" -t "${pkgdir}/etc/caddy"
   install -d "${pkgdir}/etc/caddy/conf.d"
   install -Dm 644 "${srcdir}/index.html" "${pkgdir}/usr/share/caddy/index.html"
 }

Deleted: caddy.conf
===================================================================
--- caddy.conf	2021-02-11 19:29:48 UTC (rev 856773)
+++ caddy.conf	2021-02-11 19:38:27 UTC (rev 856774)
@@ -1,28 +0,0 @@
-# The Caddyfile is an easy way to configure your Caddy web server.
-#
-# Unless the file starts with a global options block, the first
-# uncommented line is always the address of your site.
-#
-# To use your own domain name (with automatic HTTPS), first make
-# sure your domain's A/AAAA DNS records are properly pointed to
-# this machine's public IP, then replace the line below with your
-# domain name.
-:80
-
-# Set this path to your site's directory.
-root * /usr/share/caddy
-
-# Enable the static file server.
-file_server
-
-# Import additional caddy config files in /etc/caddy/conf.d/
-import /etc/caddy/conf.d/*
-
-# Another common task is to set up a reverse proxy:
-# reverse_proxy localhost:8080
-
-# Or serve a PHP site through php-fpm:
-# php_fastcgi localhost:9000
-
-# Refer to the Caddy docs for more information:
-# https://github.com/caddyserver/caddy/wiki/v2:-Documentation