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-11-06 08:03:48 +01:00
parent 9035f8c445
commit 7cbc8e1029
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bundles/bind-acme/metadata.py
View file

@ -33,11 +33,12 @@ def acme_records(metadata):
for name in { for name in {
record['name'] if record['name'] != '@' else '' record['name'] if record['name'] != '@' else ''
for record in conf['records'] for record in conf['records']
if '._domainkey' not in record['name'] if f"{record['name']}.{zone}" in metadata.get('letsencrypt/domains')
} }
} }
} }
for zone, conf in metadata.get('bind/zones').items() for zone, conf in metadata.get('bind/zones').items()
if zone != metadata.get('bind/acme_hostname')
}, },
}, },
} }

4
bundles/bind/files/db
View file

@ -11,8 +11,8 @@ $TTL 600
900 ;Negative response caching TTL 900 ;Negative response caching TTL
) )
% for record in sorted(records, key=lambda r: (r['name'], r['type'], r['value'])): % for record in sorted(records, key=lambda r: (tuple(reversed(r['name'].split('.'))), r['type'], r['value'])):
${(record['name'] or '@').ljust(column_width('name', records))} \ (${(record['name'] or '@').rjust(column_width('name', records))}) \
IN \ IN \
${record['type'].ljust(column_width('type', records))} \ ${record['type'].ljust(column_width('type', records))} \
% if record['type'] == 'TXT': % if record['type'] == 'TXT':

1
bundles/bind/items.py
View file

@ -151,6 +151,7 @@ for view in views:
'group': 'bind', 'group': 'bind',
'source': 'db', 'source': 'db',
'content_type': 'mako', 'content_type': 'mako',
'unless': f"test -f /var/lib/bind/{view['name']}/db.{zone}" if 'keys' in conf else 'false',
'context': { 'context': {
'view': view['name'], 'view': view['name'],
'serial': datetime.now().strftime('%Y%m%d%H'), 'serial': datetime.now().strftime('%Y%m%d%H'),