mirror/oskar456-dzonegit
1
0
Fork 0
mirror of https://github.com/oskar456/dzonegit.git synced 2024-05-11 05:55:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #14 from oskar456/zonerelfile

Browse Source
This commit is contained in:
Ondřej Caletka
2020-05-17 11:27:54 +02:00
committed by GitHub
parent 24d992d999 12fb932711
commit 15cdae67ee
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.rst
View File

@ -183,6 +183,9 @@ In the template strings, these placeholders are supported:
``$zonefile`` ``$zonefile``
Full path to the zone file Full path to the zone file
``$zonerelfile``
Path to the zone file, relative to checkout path (useful for chroot environments)
``$zonevar`` ``$zonevar``
Per-zone specific variable, see above Per-zone specific variable, see above

2
dzonegit.py
View File

@ -395,7 +395,7 @@ def template_config(checkoutpath, template, blacklist=set(), whitelist=set()):
zonevar = defaultvar zonevar = defaultvar
out.append(itemtpl.substitute( out.append(itemtpl.substitute(
mapping, zonename=zonename, mapping, zonename=zonename,
zonefile=str(f), zonevar=zonevar, zonefile=str(f), zonerelfile=str(f.relative_to(checkoutpath)), zonevar=zonevar,
)) ))
if footertpl.template: if footertpl.template:
out.append(footertpl.substitute(mapping)) out.append(footertpl.substitute(mapping))

2
setup.py
View File

@ -5,7 +5,7 @@ readme = Path(__file__).with_name("README.rst").read_text()
setup( setup(
name="dzonegit", name="dzonegit",
version="0.12", version="0.13",
description="Git hooks to manage a repository of DNS zones", description="Git hooks to manage a repository of DNS zones",
long_description=readme, long_description=readme,
long_description_content_type="text/x-rst", long_description_content_type="text/x-rst",