replace containers,www with svtree modules equivalents

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

11 files changed, 7 insertions, 5 deletions

diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/consumer-for b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/consumer-for
index 83c1762..83c1762 100644
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/consumer-for
+++ b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/consumer-for
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/notification-fd b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/notification-fd
index 00750ed..00750ed 100644
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/notification-fd
+++ b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/notification-fd
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/pipeline-name b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/pipeline-name
index 0db7d83..0db7d83 100644
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/pipeline-name
+++ b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/pipeline-name
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/run b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/run
index d558f3c..d558f3c 100644
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/run
+++ b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/run
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/type b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/type
index 5883cff..5883cff 100644
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/type
+++ b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-log/type
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/notification-fd b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-srv/notification-fd
index 00750ed..00750ed 100644
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/notification-fd
+++ b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-srv/notification-fd
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/producer-for b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-srv/producer-for
index cba6eea..cba6eea 100644
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/producer-for
+++ b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-srv/producer-for
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/run b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-srv/run
index 677d7e1..677d7e1 100755
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/run
+++ b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-srv/run
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/type b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-srv/type
index 5883cff..5883cff 100644
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/type
+++ b/bundles/svtree-www/files/etc/s6-rc/templates/www/+service-srv/type
diff --git a/bundles/www/items.py b/bundles/svtree-www/items.py
index b6f0cfd..086bc33 100644
--- a/bundles/www/items.py
+++ b/bundles/svtree-www/items.py
@@ -3,10 +3,6 @@ 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" },
@@ -28,9 +24,15 @@ files = {
 
 repo.libs.gen.add_files_recursive(
     files,
-    join(repo.path, "bundles", "www", "files"),
+    join(repo.bundles_dir, "svtree-www", "files"),
 )
 
+# TODO: can we use purge = True here?
+
+directories = {
+    "/etc/s6-rc/src/www/contents.d": {}
+}
+
 for www, _ in node.metadata.get("www", {}).items():
     svc_s6rc[www] = {
         "bundle": "www",
diff --git a/bundles/www/metadata.py b/bundles/svtree-www/metadata.py
index 1d5700a..1d5700a 100644
--- a/bundles/www/metadata.py
+++ b/bundles/svtree-www/metadata.py