From f9c6a523571c12da41b9abf3016724b632a3a4ed Mon Sep 17 00:00:00 2001 From: Przemyslaw Sztoch Date: Fri, 15 May 2020 23:40:13 +0200 Subject: [PATCH 1/3] New macro $zonerelfile in template file. --- dzonegit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dzonegit.py b/dzonegit.py index b0ab266..e828779 100644 --- a/dzonegit.py +++ b/dzonegit.py @@ -395,7 +395,7 @@ def template_config(checkoutpath, template, blacklist=set(), whitelist=set()): zonevar = defaultvar out.append(itemtpl.substitute( mapping, zonename=zonename, - zonefile=str(f), zonevar=zonevar, + zonefile=str(f), zonerelfile=str(f.relative_to(checkoutpath)), zonevar=zonevar, )) if footertpl.template: out.append(footertpl.substitute(mapping)) From cb543514ac284a1770dd87ff16ec2635d4f9b27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Caletka?= Date: Sun, 17 May 2020 11:23:51 +0200 Subject: [PATCH 2/3] Document $zonerelfile template macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondřej Caletka --- README.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rst b/README.rst index d71867b..6a637e5 100644 --- a/README.rst +++ b/README.rst @@ -183,6 +183,9 @@ In the template strings, these placeholders are supported: ``$zonefile`` Full path to the zone file +``$zonerelfile`` + Path to the zone file, relative to checkout path (useful for chroot environments) + ``$zonevar`` Per-zone specific variable, see above From 12fb93271184a089c0f6d4134e10fea6fe569fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Caletka?= Date: Sun, 17 May 2020 11:24:29 +0200 Subject: [PATCH 3/3] Version 0.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondřej Caletka --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f4f7f72..cdef3ce 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ readme = Path(__file__).with_name("README.rst").read_text() setup( name="dzonegit", - version="0.12", + version="0.13", description="Git hooks to manage a repository of DNS zones", long_description=readme, long_description_content_type="text/x-rst",