From 675af5495c2b3510ca17e5a1965e370795abf9de Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 27 Jan 2020 20:07:15 +0100
Subject: [PATCH 1/3] caddy: disable telemetry

---
 srcpkgs/caddy/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index e68b9f99e3cfad..bd5ad1f7dde5eb 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -18,6 +18,10 @@ make_dirs="
 	/etc/caddy 0700 caddy caddy
 	/var/lib/caddy 0700 caddy caddy"
 
+pre_build() {
+	vsed -e 's,var EnableTelemetry = true,var EnableTelemetry = false,g' -i caddy/caddymain/run.go
+}
+
 post_install() {
 	vsv caddy
 }

From 080fd88b750c87e97ffb393f98c435ea40f3070e Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 27 Jan 2020 20:23:48 +0100
Subject: [PATCH 2/3] caddy: handle max open files correctly

---
 srcpkgs/caddy/files/caddy/run | 6 +++++-
 srcpkgs/caddy/template        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/caddy/files/caddy/run b/srcpkgs/caddy/files/caddy/run
index 0e23cd4ea6ac72..ff0cc9c8030612 100644
--- a/srcpkgs/caddy/files/caddy/run
+++ b/srcpkgs/caddy/files/caddy/run
@@ -1,4 +1,8 @@
 #!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
 export CADDYPATH=/var/lib/caddy
+ulimit -n ${MAX_OPEN_FILES:-8192}
 cd /etc/caddy
-exec chpst -o 8192 -u caddy caddy
+exec chpst -u caddy caddy
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index bd5ad1f7dde5eb..c94c77b756a4c6 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=1.0.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/caddyserver/caddy
 go_package="${go_import_path}/caddy"

From ccbe9304a907c10de8ee7a233f297df4926fc7e0 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 27 Jan 2020 20:31:14 +0100
Subject: [PATCH 3/3] caddy: add vlogger

---
 srcpkgs/caddy/files/caddy/log/run | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/caddy/files/caddy/log/run

diff --git a/srcpkgs/caddy/files/caddy/log/run b/srcpkgs/caddy/files/caddy/log/run
new file mode 120000
index 00000000000000..3a5b4a586051d6
--- /dev/null
+++ b/srcpkgs/caddy/files/caddy/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file