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 813c4780ad69bd421af65171a5c4972c8ecb511a Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Mon, 27 Jan 2020 20:23:48 +0100 Subject: [PATCH 2/3] caddy: add conf for run file; handle max open files correctly --- srcpkgs/caddy/files/caddy/conf | 1 + srcpkgs/caddy/files/caddy/run | 6 +++++- srcpkgs/caddy/template | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/caddy/files/caddy/conf diff --git a/srcpkgs/caddy/files/caddy/conf b/srcpkgs/caddy/files/caddy/conf new file mode 100644 index 00000000000..c42d26ecb0a --- /dev/null +++ b/srcpkgs/caddy/files/caddy/conf @@ -0,0 +1 @@ +MAX_OPEN_FILES=8192 diff --git a/srcpkgs/caddy/files/caddy/run b/srcpkgs/caddy/files/caddy/run index 0e23cd4ea6a..2a37e8b8c37 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 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..9ef8756ccdd 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" @@ -12,6 +12,7 @@ license="Apache-2.0" homepage="https://caddyserver.com" distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz" checksum=bf81245d2b347c89a8e8aa358a224b722d55cb6e1c266bbdffbe6acc54d130a5 +conf_files="/etc/sv/caddy/conf" system_accounts="caddy" make_dirs=" From 4552b0c05c21a8896c70513895917ebe8a0a3b51 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 logger to runit service --- srcpkgs/caddy/files/caddy/log/run | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 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 100644 index 00000000000..3facf440712 --- /dev/null +++ b/srcpkgs/caddy/files/caddy/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -t caddy -p daemon.notice