From b81bf990c156ca86b0df2f5bb9e429697863b43f Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 3 Feb 2022 21:45:31 +0200 Subject: [PATCH 1/5] vault: fix and enhance service, add sample conf file. --- srcpkgs/vault/files/vault.conf | 6 ++++++ srcpkgs/vault/files/vault/log/run | 1 + srcpkgs/vault/files/vault/run | 2 +- srcpkgs/vault/template | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/vault/files/vault.conf create mode 120000 srcpkgs/vault/files/vault/log/run diff --git a/srcpkgs/vault/files/vault.conf b/srcpkgs/vault/files/vault.conf new file mode 100644 index 000000000000..c2a404c6cfcf --- /dev/null +++ b/srcpkgs/vault/files/vault.conf @@ -0,0 +1,6 @@ +# Please configure vault according to the the documentation. +# The contents below are the bare minimum to allow the service to run. + +storage "file" { + path = "/mnt/vault/data" +} diff --git a/srcpkgs/vault/files/vault/log/run b/srcpkgs/vault/files/vault/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/vault/files/vault/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/vault/files/vault/run b/srcpkgs/vault/files/vault/run index 840cc2836921..f578ddbbbd39 100644 --- a/srcpkgs/vault/files/vault/run +++ b/srcpkgs/vault/files/vault/run @@ -1,3 +1,3 @@ #!/bin/sh -exec chpst -u _vault vault server -config=/etc/vault/ +exec chpst -u _vault vault server -config=/etc/vault.conf 2>&1 diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template index 1ba3566e77c7..ff6064bf94c5 100644 --- a/srcpkgs/vault/template +++ b/srcpkgs/vault/template @@ -1,7 +1,7 @@ # Template file for 'vault' pkgname=vault version=1.9.2 -revision=1 +revision=2 build_style=go go_import_path="github.com/hashicorp/vault" go_build_tags="release" @@ -26,4 +26,5 @@ esac post_install() { vlicense LICENSE vsv vault + vconf ${FILESDIR}/vault.conf } From f68a91d7e4ed394766c9a0e5695c8915a7be29dc Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 3 Feb 2022 22:08:22 +0200 Subject: [PATCH 2/5] spampd: add log service. --- srcpkgs/spampd/files/spampd/log/run | 1 + srcpkgs/spampd/files/spampd/run | 2 +- srcpkgs/spampd/template | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/spampd/files/spampd/log/run diff --git a/srcpkgs/spampd/files/spampd/log/run b/srcpkgs/spampd/files/spampd/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/spampd/files/spampd/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/spampd/files/spampd/run b/srcpkgs/spampd/files/spampd/run index 7c19ace4ea96..8db3b3a3f0c4 100755 --- a/srcpkgs/spampd/files/spampd/run +++ b/srcpkgs/spampd/files/spampd/run @@ -1,3 +1,3 @@ #!/bin/sh [ -r conf ] && . ./conf -exec spampd --nodetach ${OPTS:=--host=127.0.0.1:10025 --relayhost=127.0.0.1:10026 --a --rh --u=_spampd --g=_spampd --maxsize=512} +exec spampd --nodetach ${OPTS:=--host=127.0.0.1:10025 --relayhost=127.0.0.1:10026 --a --rh --u=_spampd --g=_spampd --maxsize=512} 2>&1 diff --git a/srcpkgs/spampd/template b/srcpkgs/spampd/template index 4380aae4f8bc..76bd4c99f9d7 100644 --- a/srcpkgs/spampd/template +++ b/srcpkgs/spampd/template @@ -1,7 +1,7 @@ # Template file for 'spampd' pkgname=spampd version=2.30 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="perl" depends="perl perl-Net-Server spamassassin" From 082a429c3a4a7bc3294c86ff759684ce277c56f2 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 3 Feb 2022 22:17:54 +0200 Subject: [PATCH 3/5] etcd: add log service. --- srcpkgs/etcd/files/etcd/log/run | 1 + srcpkgs/etcd/files/etcd/run | 2 +- srcpkgs/etcd/template | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/etcd/files/etcd/log/run diff --git a/srcpkgs/etcd/files/etcd/log/run b/srcpkgs/etcd/files/etcd/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/etcd/files/etcd/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/etcd/files/etcd/run b/srcpkgs/etcd/files/etcd/run index 4d3f36562993..38100d14923f 100644 --- a/srcpkgs/etcd/files/etcd/run +++ b/srcpkgs/etcd/files/etcd/run @@ -4,4 +4,4 @@ export ETCD_DATA_DIR=/var/lib/etcd export ETCD_NAME=etcd [ -r conf ] && . ./conf -exec chpst -u etcd:etcd etcd +exec chpst -u etcd:etcd etcd 2>&1 diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index b255d53874f7..fbf8e4c4a5cb 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -1,7 +1,7 @@ # Template file for 'etcd' pkgname=etcd version=3.4.4 -revision=2 +revision=3 build_style=go go_import_path="github.com/coreos/etcd" go_package="${go_import_path} ${go_import_path}/etcdctl" From f7bac14c9bc95611acaeb5151d4d003f1c6daa0e Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 3 Feb 2022 22:24:35 +0200 Subject: [PATCH 4/5] cntlm: add log service. --- srcpkgs/cntlm/files/cntlm/log/run | 1 + srcpkgs/cntlm/template | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/cntlm/files/cntlm/log/run diff --git a/srcpkgs/cntlm/files/cntlm/log/run b/srcpkgs/cntlm/files/cntlm/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/cntlm/files/cntlm/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/cntlm/template b/srcpkgs/cntlm/template index 50da46505715..351bd94a07ab 100644 --- a/srcpkgs/cntlm/template +++ b/srcpkgs/cntlm/template @@ -1,7 +1,7 @@ # Template file for 'cntlm' pkgname=cntlm version=0.92.3 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="which" short_desc="NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy" From 01fffc0c1551d73fd73b7f9ab8ecdcd1911a1beb Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 5 Feb 2022 11:40:06 +0200 Subject: [PATCH 5/5] caddy: redirect stderr to the log service. --- srcpkgs/caddy/files/caddy/run | 2 +- srcpkgs/caddy/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/caddy/files/caddy/run b/srcpkgs/caddy/files/caddy/run index c8670fa67b69..36559e4af079 100644 --- a/srcpkgs/caddy/files/caddy/run +++ b/srcpkgs/caddy/files/caddy/run @@ -5,4 +5,4 @@ export HOME=/var/lib/caddy ulimit -n ${MAX_OPEN_FILES:-8192} -exec chpst -u caddy caddy run --config ${CONFFILE:-/etc/caddy/Caddyfile} +exec chpst -u caddy caddy run --config ${CONFFILE:-/etc/caddy/Caddyfile} 2>&1 diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template index 762a36749b46..90057a7f8990 100644 --- a/srcpkgs/caddy/template +++ b/srcpkgs/caddy/template @@ -1,7 +1,7 @@ # Template file for 'caddy' pkgname=caddy version=2.4.6 -revision=2 +revision=3 build_style=go go_import_path=github.com/caddyserver/caddy/v2 go_package="${go_import_path}/cmd/caddy"