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-07 14:30:28 +01:00
parent 46c12fd05f
commit 454d71e0d9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bundles/bind/metadata.py
View file

@ -116,7 +116,7 @@ def collect_records(metadata):
@metadata_reactor.provides( @metadata_reactor.provides(
'bind/zones', 'bind/views',
) )
def ns_records(metadata): def ns_records(metadata):
if metadata.get('bind/type') == 'slave': if metadata.get('bind/type') == 'slave':
@ -205,11 +205,13 @@ def generate_acl_entries_for_keys(metadata):
'views': { 'views': {
view_name: { view_name: {
'acl': { 'acl': {
# allow keys from this view
*{ *{
f'key {view_name}.{zone_name}' f'key {view_name}.{zone_name}'
for zone_name, zone_conf in view_conf['zones'].items() for zone_name, zone_conf in view_conf['zones'].items()
if zone_conf.get('key', False) if zone_conf.get('key', False)
}, },
# reject keys from other views
*{ *{
f'! key {other_view_name}.{zone_name}' f'! key {other_view_name}.{zone_name}'
for other_view_name, other_view_conf in metadata.get('bind/views').items() for other_view_name, other_view_conf in metadata.get('bind/views').items()

2
bundles/letsencrypt/items.py
View file

@ -31,7 +31,7 @@ files = {
'server': ip_interface(acme_node.metadata.get('network/external/ipv4')).ip, 'server': ip_interface(acme_node.metadata.get('network/external/ipv4')).ip,
'zone': acme_node.metadata.get('bind/acme_zone'), 'zone': acme_node.metadata.get('bind/acme_zone'),
'acme_key_name': 'external' + acme_node.metadata.get('bind/acme_zone'), 'acme_key_name': 'external' + acme_node.metadata.get('bind/acme_zone'),
'acme_key': acme_node.metadata.get('bind/views/external/keys/external.' + acme_node.metadata.get('bind/acme_zone')), 'acme_key': acme_node.metadata.get('bind/views/external/zones/'+acme_node.metadata.get('bind/acme_zone')+'/key'),
'domains': node.metadata.get('letsencrypt/domains'), 'domains': node.metadata.get('letsencrypt/domains'),
}, },
'mode': '0755', 'mode': '0755',