From 165f6005f1173294cacbdf0c46c6d3d983862e49 Mon Sep 17 00:00:00 2001 From: Frank Steinborn 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 e68b9f99e3c..bd5ad1f7dde 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 bc6cf5f819b55412821b80a2f39c8321a44cb808 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Mon, 27 Jan 2020 20:23:48 +0100 Subject: [PATCH 2/3] caddy: handle max open files correctly --- srcpkgs/caddy/files/caddy/run | 3 ++- srcpkgs/caddy/template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/caddy/files/caddy/run b/srcpkgs/caddy/files/caddy/run index 0e23cd4ea6a..6332bfac9c8 100644 --- a/srcpkgs/caddy/files/caddy/run +++ b/srcpkgs/caddy/files/caddy/run @@ -1,4 +1,5 @@ #!/bin/sh 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 bd5ad1f7dde..c94c77b756a 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 3ddcdc8d3410f3088603441a0dc2773791241f10 Mon Sep 17 00:00:00 2001 From: Frank Steinborn 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 00000000000..3a5b4a58605 --- /dev/null +++ b/srcpkgs/caddy/files/caddy/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file