From 2b2dfe659904eb64414c425619a9629ae192195a Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Wed, 2 Nov 2022 09:26:35 +0000
Subject: [PATCH] Add skeleton for bundle and fix unbound service

---
 s6/APKBUILD-s6.template |  2 +-
 s6/bundle/APKBUILD      | 12 ++++++++++++
 s6/bundle/rc/type       |  1 +
 s6/unbound/APKBUILD     |  2 +-
 s6/unbound/rc/run       |  2 +-
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 s6/bundle/APKBUILD
 create mode 100644 s6/bundle/rc/type

diff --git a/s6/APKBUILD-s6.template b/s6/APKBUILD-s6.template
index fe0efa9..8f32b93 100644
--- a/s6/APKBUILD-s6.template
+++ b/s6/APKBUILD-s6.template
@@ -5,7 +5,7 @@
 
 pkgname="$pkgname-s6-$_rx_pkgname"
 pkgdesc="RedXen s6 configuration: $_rx_pkgname"
-depends="nnd-s6-services $_rx_pkgname redxen-config-$_rx_pkgname"
+depends="redxen-s6-bundle $_rx_pkgname redxen-config-$_rx_pkgname"
 
 rx_s6_svc_install() {
 	mkdir -p "$(rx_cpkgdir)"/etc/s6/dist/rc
diff --git a/s6/bundle/APKBUILD b/s6/bundle/APKBUILD
new file mode 100644
index 0000000..8c582c2
--- /dev/null
+++ b/s6/bundle/APKBUILD
@@ -0,0 +1,12 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+
+. ../APKBUILD-s6.template
+
+pkgver=2022.11.02.01
+pkgrel=0
+depends="nnd-s6-services"
+
+package() {
+	rx_s6_svc_install "bundle.redxen"
+}
diff --git a/s6/bundle/rc/type b/s6/bundle/rc/type
new file mode 100644
index 0000000..757b422
--- /dev/null
+++ b/s6/bundle/rc/type
@@ -0,0 +1 @@
+bundle
diff --git a/s6/unbound/APKBUILD b/s6/unbound/APKBUILD
index 01258ad..91becdc 100644
--- a/s6/unbound/APKBUILD
+++ b/s6/unbound/APKBUILD
@@ -3,5 +3,5 @@
 
 . ../APKBUILD-s6.template
 
-pkgver=2022.11.01.01
+pkgver=2022.11.02.01
 pkgrel=0
diff --git a/s6/unbound/rc/run b/s6/unbound/rc/run
index 9cc1df6..7eed393 100755
--- a/s6/unbound/rc/run
+++ b/s6/unbound/rc/run
@@ -9,4 +9,4 @@ emptyenv
 
 export PATH $PATH
 
-exec unbound -c $CFGFILE
+exec unbound -p -c $CFGFILE