From b2feaf0fba154148fbe303c4ca206f9c2d60a537 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Sun, 7 May 2023 16:36:42 +0000 Subject: [PATCH] Add more s6 services and fixup unbound --- s6/gitea/APKBUILD | 7 +++++++ s6/gitea/env/CFGFILE | 1 + s6/gitea/rc/run | 8 ++++++++ s6/gitea/rc/type | 1 + s6/grafana/APKBUILD | 7 +++++++ s6/grafana/env/CFGFILE | 1 + s6/grafana/env/GRAFANA_HOME | 1 + s6/grafana/rc/run | 9 +++++++++ s6/grafana/rc/type | 1 + s6/nginx/APKBUILD | 7 +++++++ s6/nginx/env/CFGFILE | 1 + s6/nginx/rc/run | 8 ++++++++ s6/nginx/rc/type | 1 + s6/transmission/APKBUILD | 7 +++++++ s6/transmission/env/CFGDIR | 1 + s6/transmission/rc/run | 8 ++++++++ s6/transmission/rc/type | 1 + s6/unbound/APKBUILD | 2 +- s6/unbound/rc/run | 10 +++------- 19 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 s6/gitea/APKBUILD create mode 100644 s6/gitea/env/CFGFILE create mode 100755 s6/gitea/rc/run create mode 100644 s6/gitea/rc/type create mode 100644 s6/grafana/APKBUILD create mode 100644 s6/grafana/env/CFGFILE create mode 100644 s6/grafana/env/GRAFANA_HOME create mode 100755 s6/grafana/rc/run create mode 100644 s6/grafana/rc/type create mode 100644 s6/nginx/APKBUILD create mode 100644 s6/nginx/env/CFGFILE create mode 100755 s6/nginx/rc/run create mode 100644 s6/nginx/rc/type create mode 100644 s6/transmission/APKBUILD create mode 100644 s6/transmission/env/CFGDIR create mode 100755 s6/transmission/rc/run create mode 100644 s6/transmission/rc/type diff --git a/s6/gitea/APKBUILD b/s6/gitea/APKBUILD new file mode 100644 index 0000000..eb2ea2b --- /dev/null +++ b/s6/gitea/APKBUILD @@ -0,0 +1,7 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes + +. ../APKBUILD-s6.template + +pkgver=2023.05.07.01 +pkgrel=0 diff --git a/s6/gitea/env/CFGFILE b/s6/gitea/env/CFGFILE new file mode 100644 index 0000000..6f02390 --- /dev/null +++ b/s6/gitea/env/CFGFILE @@ -0,0 +1 @@ +/etc/redxen/gitea/redxen.ini diff --git a/s6/gitea/rc/run b/s6/gitea/rc/run new file mode 100755 index 0000000..4f97607 --- /dev/null +++ b/s6/gitea/rc/run @@ -0,0 +1,8 @@ +#!/bin/execlineb -P +s6-envdir -I /etc/s6/env/redxen.gitea +importas -i CFGFILE CFGFILE + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +gitea web --config $CFGFILE diff --git a/s6/gitea/rc/type b/s6/gitea/rc/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/s6/gitea/rc/type @@ -0,0 +1 @@ +longrun diff --git a/s6/grafana/APKBUILD b/s6/grafana/APKBUILD new file mode 100644 index 0000000..eb2ea2b --- /dev/null +++ b/s6/grafana/APKBUILD @@ -0,0 +1,7 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes + +. ../APKBUILD-s6.template + +pkgver=2023.05.07.01 +pkgrel=0 diff --git a/s6/grafana/env/CFGFILE b/s6/grafana/env/CFGFILE new file mode 100644 index 0000000..a75ab79 --- /dev/null +++ b/s6/grafana/env/CFGFILE @@ -0,0 +1 @@ +/etc/redxen/grafana/main.ini diff --git a/s6/grafana/env/GRAFANA_HOME b/s6/grafana/env/GRAFANA_HOME new file mode 100644 index 0000000..dd49dc6 --- /dev/null +++ b/s6/grafana/env/GRAFANA_HOME @@ -0,0 +1 @@ +/var/lib/grafana/ diff --git a/s6/grafana/rc/run b/s6/grafana/rc/run new file mode 100755 index 0000000..4c1595d --- /dev/null +++ b/s6/grafana/rc/run @@ -0,0 +1,9 @@ +#!/bin/execlineb -P +s6-envdir -I /etc/s6/env/redxen.grafana +importas -i CFGFILE CFGFILE +importas -i GRAFANA_HOME GRAFANA_HOME + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +grafana-server -config $CFGFILE -homepath /usr/share/grafana -cfg:default.paths.data=${GRAFANA_HOME}/data -cfg:default.paths.plugins=${GRAFANA_HOME}/plugins -cfg:default.paths.provisioning=${GRAFANA_HOME}/provisioning diff --git a/s6/grafana/rc/type b/s6/grafana/rc/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/s6/grafana/rc/type @@ -0,0 +1 @@ +longrun diff --git a/s6/nginx/APKBUILD b/s6/nginx/APKBUILD new file mode 100644 index 0000000..eb2ea2b --- /dev/null +++ b/s6/nginx/APKBUILD @@ -0,0 +1,7 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes + +. ../APKBUILD-s6.template + +pkgver=2023.05.07.01 +pkgrel=0 diff --git a/s6/nginx/env/CFGFILE b/s6/nginx/env/CFGFILE new file mode 100644 index 0000000..0a6f20f --- /dev/null +++ b/s6/nginx/env/CFGFILE @@ -0,0 +1 @@ +/etc/redxen/nginx/main.conf diff --git a/s6/nginx/rc/run b/s6/nginx/rc/run new file mode 100755 index 0000000..03ce535 --- /dev/null +++ b/s6/nginx/rc/run @@ -0,0 +1,8 @@ +#!/bin/execlineb -P +s6-envdir -I /etc/s6/env/redxen.gitea +importas -i CFGFILE CFGFILE + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +nginx -c $CFGFILE diff --git a/s6/nginx/rc/type b/s6/nginx/rc/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/s6/nginx/rc/type @@ -0,0 +1 @@ +longrun diff --git a/s6/transmission/APKBUILD b/s6/transmission/APKBUILD new file mode 100644 index 0000000..eb2ea2b --- /dev/null +++ b/s6/transmission/APKBUILD @@ -0,0 +1,7 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes + +. ../APKBUILD-s6.template + +pkgver=2023.05.07.01 +pkgrel=0 diff --git a/s6/transmission/env/CFGDIR b/s6/transmission/env/CFGDIR new file mode 100644 index 0000000..83d85d8 --- /dev/null +++ b/s6/transmission/env/CFGDIR @@ -0,0 +1 @@ +/etc/redxen/transmission diff --git a/s6/transmission/rc/run b/s6/transmission/rc/run new file mode 100755 index 0000000..2302065 --- /dev/null +++ b/s6/transmission/rc/run @@ -0,0 +1,8 @@ +#!/bin/execlineb -P +s6-envdir -I /etc/s6/env/redxen.transmission +importas -i CFGDIR CFGDIR + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +transmission-daemon -f -c $CFGDIR diff --git a/s6/transmission/rc/type b/s6/transmission/rc/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/s6/transmission/rc/type @@ -0,0 +1 @@ +longrun diff --git a/s6/unbound/APKBUILD b/s6/unbound/APKBUILD index 91becdc..eb2ea2b 100644 --- a/s6/unbound/APKBUILD +++ b/s6/unbound/APKBUILD @@ -3,5 +3,5 @@ . ../APKBUILD-s6.template -pkgver=2022.11.02.01 +pkgver=2023.05.07.01 pkgrel=0 diff --git a/s6/unbound/rc/run b/s6/unbound/rc/run index 7eed393..dfe662e 100755 --- a/s6/unbound/rc/run +++ b/s6/unbound/rc/run @@ -1,12 +1,8 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - s6-envdir -I /etc/s6/env/redxen.unbound importas -i CFGFILE CFGFILE -emptyenv +s6-envdir -i /etc/s6/env/path +emptyenv -p -export PATH $PATH - -exec unbound -p -c $CFGFILE +unbound -p -c $CFGFILE