From 946b6c439a2597e839e1c6881e30a769c5e5a0dd Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sun, 20 Jun 2021 11:57:30 +0200
Subject: [PATCH] wip

---
 bundles/bind/files/db | 18 +++++++++++-------
 bundles/bind/items.py |  4 ----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bundles/bind/files/db b/bundles/bind/files/db
index 2f8aae4..519c01e 100644
--- a/bundles/bind/files/db
+++ b/bundles/bind/files/db
@@ -1,15 +1,19 @@
+<%!
+def column_width(column, table):
+    return max(map(lambda row: len(row[column]), table)) if table else 0
+%>\
 $TTL 600
-@   IN  SOA     ns.sublimity.de. admin.sublimity.de. (
-        2020080302  ;Serial
-        1200        ;Refresh
-        600         ;Retry
-        1209600     ;Expire
-        600         ;Negative response caching TTL
+@   IN  SOA        ns.sublimity.de. admin.sublimity.de. (
+        2020080302 ;Serial
+        1200       ;Refresh
+        600        ;Retry
+        1209600    ;Expire
+        600        ;Negative response caching TTL
 )
 
 % for record in sorted(records, key=lambda r: (r['name'], r['type'], r['value'])):
   % for part in (record['value'][i:i+255] for i in range(0, len(record['value']), 255)):
-${record['name'].ljust(column_width('name', records))} \
+${record['name'].rjust(column_width('name', records))} \
 IN \
 ${record['type'].ljust(column_width('type', records))} \
 "${part}"
diff --git a/bundles/bind/items.py b/bundles/bind/items.py
index 2bf07f4..d5da4d3 100644
--- a/bundles/bind/items.py
+++ b/bundles/bind/items.py
@@ -6,15 +6,11 @@ files['/etc/default/bind9'] = {
     'source': 'defaults',
 }
 
-def column_width(column, table):
-    return max(map(lambda row: len(row[column]), table)) if table else 0
-
 for zone, records in node.metadata.get('bind/zones').items():
     files[f'/var/lib/bind/db.{zone}'] = {
         'source': 'db',
         'content_type': 'mako',
         'context': {
             'records': records,
-            'column_width': column_width,
         }
     }