go-away: use config.yml and vendor all configuration files

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

1 files changed, 36 insertions, 18 deletions

diff --git a/bundles/go-away/items.py b/bundles/go-away/items.py
index 904b922..7761734 100644
--- a/bundles/go-away/items.py
+++ b/bundles/go-away/items.py
@@ -1,3 +1,4 @@
+from os.path import join
 
 # local_deploy = {
 #     "/usr/bin/go-away": {
@@ -8,34 +9,51 @@
 #     },
 # }
 
-directories = {
-    "/var/lib/go-away": {
-        "mode": "0775",
-        "group": "wheel",
-        "owner": "nobody",
-    },
-}
-
 files = {
-    "/etc/service/go-away.run": {
-        "content_type": "mako",
-        "mode": "0755",
-        "triggers": {"svc_s6rc:go-away:restart"},
+    "/etc/s6-rc/services/go-away.run": {
+        'content_type': "mako",
+        'mode': "0755",
+        'triggers': {
+            "svc_s6rc:go-away:restart"
+        },
     },
-
     "/etc/traefik/go-away.yaml": {
-        "content_type": "mako",
-        "source": "traefik.yaml",
-        "needs": {
+        'content_type': "mako",
+        'source': "traefik.yaml",
+        'needs': {
             "bundle:traefik",
         },
     },
+    "/var/lib/go-away/config/config.yml": { 'content_type': "mako" },
+    "/var/lib/go-away/go-away": {
+        'content_type': "any",
+        'mode': "0755",
+    },
+}
 
+directories = {
+    "/var/lib/go-away": {
+        'mode': "0775",
+        'group': "wheel",
+        'owner': "nobody",
+        'purge': True,
+    },
 }
 
+repo.libs.gen.merge(files, repo.libs.gen.tree(
+    join(repo.bundles_dir, "go-away", "files", "config"),
+    keep_parent=True,
+    target_dir="/var/lib/go-away/",
+    common={
+        'triggers': {
+            "svc_s6rc:go-away:restart"
+        },
+    },
+))
+
 svc_s6rc = {
     "go-away": {
-        "bundle": "services",
-        "generate": "service",
+        'bundle': "services",
+        'generate': "service",
     }
 }