replace containers,www with svtree modules equivalents

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

11 files changed, 0 insertions, 97 deletions

diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/consumer-for b/bundles/www/files/etc/s6-rc/templates/www/+service-log/consumer-for
deleted file mode 100644
index 83c1762..0000000
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-+service-srv
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/notification-fd b/bundles/www/files/etc/s6-rc/templates/www/+service-log/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/pipeline-name b/bundles/www/files/etc/s6-rc/templates/www/+service-log/pipeline-name
deleted file mode 100644
index 0db7d83..0000000
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/pipeline-name
+++ /dev/null
@@ -1 +0,0 @@
-+service
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/run b/bundles/www/files/etc/s6-rc/templates/www/+service-log/run
deleted file mode 100644
index d558f3c..0000000
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/execlineb -P
-
-envfile -I /etc/s6-rc/system.conf
-importas -sCuD "/run/log" s6_log_dir s6_log_dir
-
-envfile -I /etc/s6-rc/+service.conf
-importas -sCuD "n3 s2000000 T" s6_log_directives s6_log_directives
-
-foreground { install -d ${s6_log_dir}/+service }
-exec -c s6-log -d3 -b -- ${s6_log_directives} ${s6_log_dir}/+service
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-log/type b/bundles/www/files/etc/s6-rc/templates/www/+service-log/type
deleted file mode 100644
index 5883cff..0000000
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-log/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/notification-fd b/bundles/www/files/etc/s6-rc/templates/www/+service-srv/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/producer-for b/bundles/www/files/etc/s6-rc/templates/www/+service-srv/producer-for
deleted file mode 100644
index cba6eea..0000000
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-+service-log
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/run b/bundles/www/files/etc/s6-rc/templates/www/+service-srv/run
deleted file mode 100755
index 677d7e1..0000000
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/run
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/execlineb -P
-
-# load location of deployments from system config
-envfile /etc/s6-rc/system.conf
-importas -iu www_dir www_dir
-
-# load port from service config
-envfile /etc/s6-rc/+service.conf
-importas -iu www_port www_port
-
-# route all logs to stdout
-fdmove -c 2 1
-
-ifthenelse -s { eltest -e ${www_dir}/+service/Caddyfile }
-{
-	define caddyfile ${www_dir}/+service/Caddyfile
-}
-{
-	define caddyfile /etc/caddy/www.conf
-}
-
-# check that port env var is actually used
-if -X { grep -q CADDY_HTTP_PORT ${caddyfile} }
-export CADDY_HTTP_PORT ${www_port}
-
-cd ${www_dir}/+service
-
-exec caddy run --watch \
-	--pidfile=/dev/fd/3 \
-	--adapter=caddyfile \
-	--config=${caddyfile}
diff --git a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/type b/bundles/www/files/etc/s6-rc/templates/www/+service-srv/type
deleted file mode 100644
index 5883cff..0000000
--- a/bundles/www/files/etc/s6-rc/templates/www/+service-srv/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/bundles/www/items.py b/bundles/www/items.py
deleted file mode 100644
index b6f0cfd..0000000
--- a/bundles/www/items.py
+++ /dev/null
@@ -1,41 +0,0 @@
-if node.os != "alpine":
-    raise BundleError(f"{node.name}: OS {node.os} is not supported.")
-
-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/src/default/contents.d/www": {
-        "content_type": "text",
-        "content": "",
-        "triggers": {
-            "svc_openrc:svtree:reload",
-        },
-    },
-    "/etc/s6-rc/src/www/type": {
-        "content_type": "text",
-        "content": "bundle",
-        "triggers": {
-            "svc_openrc:svtree:reload",
-        },
-    },
-}
-
-repo.libs.gen.add_files_recursive(
-    files,
-    join(repo.path, "bundles", "www", "files"),
-)
-
-for www, _ in node.metadata.get("www", {}).items():
-    svc_s6rc[www] = {
-        "bundle": "www",
-        "generate": "www",
-        "triggers": {
-            "svc_openrc:svtree:reload",
-        },
-    }
diff --git a/bundles/www/metadata.py b/bundles/www/metadata.py
deleted file mode 100644
index 1d5700a..0000000
--- a/bundles/www/metadata.py
+++ /dev/null
@@ -1,8 +0,0 @@
-defaults = {
-    "apk": {
-        "packages": {
-            "caddy": {},
-            "rsync": {}, # used to sync up changes
-        },
-    },
-}