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

bind remove db prefix

Browse source
This commit is contained in:
mwiegand 2021-11-14 16:18:27 +01:00
parent b70c8e8217
commit fc65db3de5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/bind/files/named.conf.local
View file

@ -57,7 +57,7 @@ view "${view_name}" {
% endfor % endfor
}; };
% endif % endif
file "/var/lib/bind/${view_name}/db.${zone_name}"; file "/var/lib/bind/${view_name}/${zone_name}";
}; };
% endfor % endfor

6
bundles/bind/items.py
View file

@ -109,7 +109,7 @@ for view_name, view_conf in master_node.metadata.get('bind/views').items():
} }
for zone_name, zone_conf in view_conf['zones'].items(): for zone_name, zone_conf in view_conf['zones'].items():
files[f"/var/lib/bind/{view_name}/db.{zone_name}"] = { files[f"/var/lib/bind/{view_name}/{zone_name}"] = {
'owner': 'bind', 'owner': 'bind',
'group': 'bind', 'group': 'bind',
'needs': [ 'needs': [
@ -123,10 +123,10 @@ for view_name, view_conf in master_node.metadata.get('bind/views').items():
], ],
} }
#FIXME: slave doesnt get updated if db doesnt get rewritten on each apply #FIXME: slave doesnt get updated if db doesnt get rewritten on each apply
files[f"/var/lib/bind/{view_name}/db.{zone_name}"].update({ files[f"/var/lib/bind/{view_name}/{zone_name}"].update({
'source': 'db', 'source': 'db',
'content_type': 'mako', 'content_type': 'mako',
'unless': f"test -f /var/lib/bind/{view_name}/db.{zone_name}" if zone_conf.get('allow_update', False) else 'false', 'unless': f"test -f /var/lib/bind/{view_name}/{zone_name}" if zone_conf.get('allow_update', False) else 'false',
'context': { 'context': {
'serial': datetime.now().strftime('%Y%m%d%H'), 'serial': datetime.now().strftime('%Y%m%d%H'),
'records': zone_conf['records'], 'records': zone_conf['records'],