cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
mwiegand 2021-07-06 23:06:59 +02:00
parent db7baec56e
commit 1114c6d6a3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bundles/letsencrypt/items.py
View file

@ -1,5 +1,7 @@
assert node.has_bundle('nginx') assert node.has_bundle('nginx')
delegated = 'delegate_to_node' in node.metadata.get('letsencrypt')
directories = { directories = {
'/etc/dehydrated/conf.d': {}, '/etc/dehydrated/conf.d': {},
'/var/lib/dehydrated/acme-challenges': {}, '/var/lib/dehydrated/acme-challenges': {},
@ -29,6 +31,7 @@ files = {
actions['letsencrypt_update_certificates'] = { actions['letsencrypt_update_certificates'] = {
'command': 'dehydrated --cron --accept-terms --challenge http-01', 'command': 'dehydrated --cron --accept-terms --challenge http-01',
'triggered': True, 'triggered': True,
'skip': delegated,
'needs': { 'needs': {
'svc_systemd:nginx', 'svc_systemd:nginx',
}, },

4
bundles/nginx/metadata.py
View file

@ -52,9 +52,9 @@ defaults = {
} }
@metadata_reactor.provides( @metadata_reactor.provides(
'nginx/includes/php', 'nginx/includes',
) )
def php(metadata): def includes(metadata):
return { return {
'nginx': { 'nginx': {
'includes': { 'includes': {