replace s6 with svtree bundle

Signed-off-by: Robert Günzler <r@gnzler.io>

1 files changed, 11 insertions, 10 deletions

diff --git a/bundles/www/items.py b/bundles/www/items.py
index 7805991..b6f0cfd 100644
--- a/bundles/www/items.py
+++ b/bundles/www/items.py
@@ -3,23 +3,25 @@ if node.os != "alpine":
 
 from os.path import join
 
+directories = {
+    "/etc/s6-rc/src/www/contents.d": { 'purge': True }
+}
+
 files = {
     "/etc/s6-rc/templates/www/+service-srv/run": { "mode": "0755" },
     "/etc/s6-rc/templates/www/+service-log/run": { "mode": "0755" },
-    "/etc/s6-rc/services/default/contents.d/www": {
+    "/etc/s6-rc/src/default/contents.d/www": {
         "content_type": "text",
         "content": "",
         "triggers": {
-            "svc_openrc:s6-rc-init:reload",
-            "svc_openrc:s6-rc-up:restart",
+            "svc_openrc:svtree:reload",
         },
     },
-    "/etc/s6-rc/services/www/type": {
+    "/etc/s6-rc/src/www/type": {
         "content_type": "text",
         "content": "bundle",
         "triggers": {
-            "svc_openrc:s6-rc-init:reload",
-            "svc_openrc:s6-rc-up:restart",
+            "svc_openrc:svtree:reload",
         },
     },
 }
@@ -29,12 +31,11 @@ repo.libs.gen.add_files_recursive(
     join(repo.path, "bundles", "www", "files"),
 )
 
-directories = {
-    "/etc/s6-rc/services/www/contents.d": {}
-}
-
 for www, _ in node.metadata.get("www", {}).items():
     svc_s6rc[www] = {
         "bundle": "www",
         "generate": "www",
+        "triggers": {
+            "svc_openrc:svtree:reload",
+        },
     }