From 1114c6d6a308c28738c9a842b8b34ea9a1d58838 Mon Sep 17 00:00:00 2001 From: mwiegand Date: Tue, 6 Jul 2021 23:06:59 +0200 Subject: [PATCH] wip --- bundles/letsencrypt/items.py | 3 +++ bundles/nginx/metadata.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bundles/letsencrypt/items.py b/bundles/letsencrypt/items.py index 4174ffb..1835866 100644 --- a/bundles/letsencrypt/items.py +++ b/bundles/letsencrypt/items.py @@ -1,5 +1,7 @@ assert node.has_bundle('nginx') +delegated = 'delegate_to_node' in node.metadata.get('letsencrypt') + directories = { '/etc/dehydrated/conf.d': {}, '/var/lib/dehydrated/acme-challenges': {}, @@ -29,6 +31,7 @@ files = { actions['letsencrypt_update_certificates'] = { 'command': 'dehydrated --cron --accept-terms --challenge http-01', 'triggered': True, + 'skip': delegated, 'needs': { 'svc_systemd:nginx', }, diff --git a/bundles/nginx/metadata.py b/bundles/nginx/metadata.py index 3f1030c..4a60e7e 100644 --- a/bundles/nginx/metadata.py +++ b/bundles/nginx/metadata.py @@ -52,9 +52,9 @@ defaults = { } @metadata_reactor.provides( - 'nginx/includes/php', + 'nginx/includes', ) -def php(metadata): +def includes(metadata): return { 'nginx': { 'includes': {