diff options
Diffstat (limited to 'bundles/containers/items.py')
| -rw-r--r-- | bundles/containers/items.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/bundles/containers/items.py b/bundles/containers/items.py index eb28c44..ea5b341 100644 --- a/bundles/containers/items.py +++ b/bundles/containers/items.py @@ -12,6 +12,10 @@ svc_openrc = { }, } +directories = { + "/etc/s6-rc/src/containers/contents.d": { 'purge': True }, +} + files = { "/etc/containers/containers.conf.d/10-firewall-driver.conf": { "needs": { @@ -21,18 +25,18 @@ files = { "/etc/s6-rc/templates/container/+service-srv/run": { "mode": "0755" }, "/etc/s6-rc/templates/container/+service-log/run": { "mode": "0755" }, - "/etc/s6-rc/services/default/contents.d/containers": { + "/etc/s6-rc/src/default/contents.d/containers": { "content_type": "text", "content": "", "triggers": { - "svc_openrc:s6-rc-up:restart", + "svc_openrc:svtree:reload", }, }, - "/etc/s6-rc/services/containers/type": { + "/etc/s6-rc/src/containers/type": { "content_type": "text", "content": "bundle", "triggers": { - "svc_openrc:s6-rc-up:restart", + "svc_openrc:svtree:reload", }, }, @@ -48,16 +52,11 @@ repo.libs.gen.add_files_recursive( join(repo.path, "bundles", "containers", "files"), ) -directories = { - "/etc/s6-rc/services/containers/contents.d": {} -} - for container, _ in node.metadata.get("containers", {}).items(): svc_s6rc[container] = { "bundle": "containers", "generate": "container", "triggers": { - "svc_openrc:s6-rc-init:reload", - "svc_openrc:s6-rc-up:reload", + "svc_openrc:svtree:reload", }, } |