* [PR PATCH] caddy: several template improvements
@ 2020-01-27 19:51 voidlinux-github
2020-01-29 13:15 ` voidlinux-github
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-27 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
There is a new pull request by steinex against master on the void-packages repository
https://github.com/steinex/void-packages caddy
https://github.com/void-linux/void-packages/pull/18592
caddy: several template improvements
A patch file from https://github.com/void-linux/void-packages/pull/18592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-caddy-18592.patch --]
[-- Type: text/x-diff, Size: 2981 bytes --]
From 165f6005f1173294cacbdf0c46c6d3d983862e49 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 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 <steinex@nognu.de>
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 <steinex@nognu.de>
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: caddy: several template improvements
2020-01-27 19:51 [PR PATCH] caddy: several template improvements voidlinux-github
@ 2020-01-29 13:15 ` voidlinux-github
2020-01-29 15:54 ` [PR PATCH] [Updated] " voidlinux-github
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-29 13:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/18592#issuecomment-579749772
Comment:
We never ship default `/etc/sv/foo/conf` files, we use something like `${MAX_OPEN_FILES:-8192}` to have a default value.
The `logger` will send logs into the void if its started before the syslog daemon, use `vlogger(1)`.
In this case you can even just do `ln -s /usr/bin/vlogger srcpkgs/caddy/log/run` instead, vlogger will get the tag argument from the service path and `daemon.info` is the default priority.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] caddy: several template improvements
2020-01-27 19:51 [PR PATCH] caddy: several template improvements voidlinux-github
2020-01-29 13:15 ` voidlinux-github
@ 2020-01-29 15:54 ` voidlinux-github
2020-01-29 15:55 ` voidlinux-github
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-29 15:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There is an updated pull request by steinex against master on the void-packages repository
https://github.com/steinex/void-packages caddy
https://github.com/void-linux/void-packages/pull/18592
caddy: several template improvements
A patch file from https://github.com/void-linux/void-packages/pull/18592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-caddy-18592.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]
From 165f6005f1173294cacbdf0c46c6d3d983862e49 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 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 <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 | 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 <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 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/caddy/files/caddy/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: caddy: several template improvements
2020-01-27 19:51 [PR PATCH] caddy: several template improvements voidlinux-github
2020-01-29 13:15 ` voidlinux-github
2020-01-29 15:54 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-29 15:55 ` voidlinux-github
2020-01-29 15:58 ` voidlinux-github
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-29 15:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by steinex on void-packages repository
https://github.com/void-linux/void-packages/pull/18592#issuecomment-579824985
Comment:
Thank you for the suggestions! Incorporated.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: caddy: several template improvements
2020-01-27 19:51 [PR PATCH] caddy: several template improvements voidlinux-github
` (2 preceding siblings ...)
2020-01-29 15:55 ` voidlinux-github
@ 2020-01-29 15:58 ` voidlinux-github
2020-01-29 16:00 ` [PR PATCH] [Updated] " voidlinux-github
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-29 15:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/18592#issuecomment-579826255
Comment:
You still need the `[ -r ./conf ] && . ./conf` in the run script.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] caddy: several template improvements
2020-01-27 19:51 [PR PATCH] caddy: several template improvements voidlinux-github
` (3 preceding siblings ...)
2020-01-29 15:58 ` voidlinux-github
@ 2020-01-29 16:00 ` voidlinux-github
2020-01-29 16:01 ` voidlinux-github
2020-02-14 15:24 ` [PR PATCH] [Merged]: " xtraeme
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-29 16:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There is an updated pull request by steinex against master on the void-packages repository
https://github.com/steinex/void-packages caddy
https://github.com/void-linux/void-packages/pull/18592
caddy: several template improvements
A patch file from https://github.com/void-linux/void-packages/pull/18592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-caddy-18592.patch --]
[-- Type: text/x-diff, Size: 2336 bytes --]
From 165f6005f1173294cacbdf0c46c6d3d983862e49 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 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 ba3ff5a7585a0f2c4191c78988dacb7dbbee4d8d 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 0e23cd4ea6a..ff0cc9c8030 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 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 279a72353079173700d049e47f6597f8b6716f37 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 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/caddy/files/caddy/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: caddy: several template improvements
2020-01-27 19:51 [PR PATCH] caddy: several template improvements voidlinux-github
` (4 preceding siblings ...)
2020-01-29 16:00 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-29 16:01 ` voidlinux-github
2020-02-14 15:24 ` [PR PATCH] [Merged]: " xtraeme
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-29 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New comment by steinex on void-packages repository
https://github.com/void-linux/void-packages/pull/18592#issuecomment-579827908
Comment:
Ofc. Done.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: caddy: several template improvements
2020-01-27 19:51 [PR PATCH] caddy: several template improvements voidlinux-github
` (5 preceding siblings ...)
2020-01-29 16:01 ` voidlinux-github
@ 2020-02-14 15:24 ` xtraeme
6 siblings, 0 replies; 8+ messages in thread
From: xtraeme @ 2020-02-14 15:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
There's a merged pull request on the void-packages repository
caddy: several template improvements
https://github.com/void-linux/void-packages/pull/18592
Description:
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-02-14 15:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-27 19:51 [PR PATCH] caddy: several template improvements voidlinux-github
2020-01-29 13:15 ` voidlinux-github
2020-01-29 15:54 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-29 15:55 ` voidlinux-github
2020-01-29 15:58 ` voidlinux-github
2020-01-29 16:00 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-29 16:01 ` voidlinux-github
2020-02-14 15:24 ` [PR PATCH] [Merged]: " xtraeme
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).