bundles/mariadb/files/override.conf

@@ -0,0 +1,11 @@
+% for section, options in sorted(conf.items()):
+[${section}]
+% for key, value in sorted(options.items()):
+% if value is None:
+${key}
+% else:
+${key} = ${value}
+% endif
+% endfor
+
+% endfor

bundles/mariadb/items.py

@@ -10,6 +10,8 @@ directories = {
         'group': 'mysql',
         'needs': [
             'zfs_dataset:tank/mariadb',
+        ],
+        'needs': [
             'pkg_apt:mariadb-server',
             'pkg_apt:mariadb-client',
         ],
@@ -18,8 +20,10 @@ directories = {
 
 files = {
     '/etc/mysql/conf.d/override.conf': {
-        'content': repo.libs.ini.dumps(node.metadata.get('mariadb/conf')),
-        'content_type': 'text',
+        'context': {
+            'conf': node.metadata.get('mariadb/conf'),
+        },
+        'content_type': 'mako',
     },
 }
 

bundles/mariadb/metadata.py

@@ -3,12 +3,12 @@ defaults = {
         'packages': {
             'mariadb-server': {
                 'needs': {
-                    'zfs_dataset:tank/mariadb',
+                    #'zfs_dataset:tank/mariadb',
                 },
             },
             'mariadb-client': {
                 'needs': {
-                    'zfs_dataset:tank/mariadb',
+                    #'zfs_dataset:tank/mariadb',
                 },
             },
         },

libs/ini.py

@@ -14,7 +14,7 @@ class CaseSensitiveConfigParser(ConfigParser):
         return value
 
 def parse(text):
-    config = CaseSensitiveConfigParser(allow_no_value=True)
+    config = CaseSensitiveConfigParser()
     config.read_string(text)
 
     return {
@@ -24,7 +24,8 @@ def parse(text):
 
 def dumps(dict):
     sorted_dict = json.loads(json.dumps(dict, sort_keys=True, cls=MetadataJSONEncoder))
-    parser = CaseSensitiveConfigParser(allow_no_value=True)
+
+    parser = CaseSensitiveConfigParser()
     parser.read_dict(sorted_dict)
 
     writable = Writable()

nodes/home.router.py

@@ -15,7 +15,7 @@
         'id': '1d6a43e5-858c-42f9-9c40-ab63d61c787c',
         'network': {
             'external': {
-                'interface': 'enp2s0',
+                'interface': 'enx00e04c220682',
                 'ipv4': '10.0.99.126/24',
                 'gateway4': '10.0.99.1',
                 'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal', 'proxmox'},