wip

bundles/gitea/items.py

@@ -43,3 +43,11 @@ files['/etc/gitea/app.ini'] = {
         'svc_systemd:gitea:restart',
     },
 }
+
+svc_systemd['gitea'] = {
+    'needs': [
+        'action:chmod_gitea',
+        'download:/usr/local/bin/gitea',
+        'file:/etc/gitea/app.ini',
+    ],
+}

bundles/gitea/metadata.py

@@ -28,35 +28,27 @@ defaults = {
         },
     },
     'systemd': {
-        'services': {
-            'gitea': {
-                'content': {
-                    'Unit': {
-                        'Description': 'gitea',
-                        'After': 'syslog.target',
-                        'After': 'network.target',
-                        'Requires': 'postgresql.service',
-                    },
-                    'Service': {
-                        'RestartSec': '2s',
-                        'Type': 'simple',
-                        'User': 'git',
-                        'Group': 'git',
-                        'WorkingDirectory': '/var/lib/gitea/',
-                        'ExecStart': '/usr/local/bin/gitea web -c /etc/gitea/app.ini',
-                        'Restart': 'always',
-                        'Environment': 'USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea',
-                    },
-                    'Install': {
-                        'WantedBy': 'multi-user.target',
-                    },
+        'units': {
+            'gitea.service': {
+                'Unit': {
+                    'Description': 'gitea',
+                    'After': 'syslog.target',
+                    'After': 'network.target',
+                    'Requires': 'postgresql.service',
+                },
+                'Service': {
+                    'RestartSec': '2s',
+                    'Type': 'simple',
+                    'User': 'git',
+                    'Group': 'git',
+                    'WorkingDirectory': '/var/lib/gitea/',
+                    'ExecStart': '/usr/local/bin/gitea web -c /etc/gitea/app.ini',
+                    'Restart': 'always',
+                    'Environment': 'USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea',
+                },
+                'Install': {
+                    'WantedBy': 'multi-user.target',
                 },
-                'needs': [
-                    'action:chmod_gitea',
-                    'download:/usr/local/bin/gitea',
-                    'file:/etc/systemd/system/gitea.service',
-                    'file:/etc/gitea/app.ini',
-                ],
             },
         },
     },

bundles/influxdb2/metadata.py

@@ -34,6 +34,7 @@ defaults = {
 
 @metadata_reactor.provides(
     'influxdb/password',
+    'influxdb/admin_token',
 )
 def admin_password(metadata):
     return {

bundles/network/metadata.py

@@ -7,13 +7,13 @@ defaults = {
 
 
 @metadata_reactor.provides(
-    'systemd-networkd/networks',
+    'systemd/units',
 )
-def systemd_networkd(metadata):
+def units(metadata):
     units = {}
     
     for type, network in metadata.get('network').items():
-        units[type] = {
+        units[f'{type}.network'] = {
             'Match': {
                 'Name': network['interface'],
             },
@@ -25,13 +25,13 @@ def systemd_networkd(metadata):
         
         for i in [4, 6]:
             if network.get(f'ipv{i}', None):
-                units[type].update({
+                units[f'{type}.network'].update({
                     f'Address#ipv{i}': {
                         'Address': network[f'ipv{i}'],
                     },
                 })
                 if f'gateway{i}' in network:
-                    units[type].update({
+                    units[f'{type}.network'].update({
                         f'Route#ipv{i}': {
                             'Gateway': network[f'gateway{i}'],
                             'GatewayOnlink': 'yes',
@@ -40,7 +40,7 @@ def systemd_networkd(metadata):
 
     
     return {
-        'systemd-networkd': {
-            'networks': units,
+        'systemd': {
+            'units': units,
         }
     }

bundles/systemd-networkd/items.py

@@ -4,10 +4,9 @@ files = {
     '/etc/network/interfaces': {
         'delete': True,
     },
-}
-
-files['/etc/resolv.conf'] = {
-    'content_type': 'mako',
+    '/etc/resolv.conf': {
+        'content_type': 'mako',
+    },
 }
 
 directories = {
@@ -16,21 +15,6 @@ directories = {
     },
 }
 
-for type, path in {
-    'networks': '/etc/systemd/network/{}.network',
-    'netdevs': '/etc/systemd/network/{}.netdev',
-}.items():
-    for name, config in node.metadata.get(f'systemd-networkd/{type}').items():
-        files[path.format(name)] = {
-            'content': repo.libs.systemd.generate_unitfile(config),
-            'needed_by': {
-                'svc_systemd:systemd-networkd',
-            },
-            'triggers': {
-                'svc_systemd:systemd-networkd:restart',
-            },
-        }
-
 svc_systemd = {
     'systemd-networkd': {},
 }

bundles/systemd-networkd/metadata.py

@@ -6,8 +6,4 @@ defaults = {
             },
         },
     },
-    'systemd-networkd': {
-        'netdevs': {},
-        'networks': {},
-    },
 }

bundles/systemd-timers/items.py

@@ -1,26 +1,27 @@
-# svc_systemd['cron'] = {
-#     'enabled': False,
-# }
-
-for name, config in node.metadata.get('systemd-timers').items():
-    files[f'/etc/systemd/system/{name}.timer'] = {
-        'content': repo.libs.systemd.generate_unitfile({
-            'Unit':{
-                'Description': f'{name} timer',
-            },
-            'Timer': {
-                'OnCalendar': config['when'],
-                'Persistent': config.get('persistent', False),
-                'Unit': f'{name}.service',
-            },
-            'Install': {
-                'WantedBy': 'multi-user.target',
-            }
-        }),
-        'triggers': [
-            'action:systemd-reload',
-            f'svc_systemd:{name}:restart',
-        ],
-    }
-    
-    svc_systemd[f'{name}.timer'] = {}
+# # svc_systemd['cron'] = {
+# #     'enabled': False,
+# # }
+# 
+# for name, config in node.metadata.get('systemd-timers').items():
+#     files[f'/etc/systemd/system/{name}.timer'] = {
+#         'content': repo.libs.systemd.generate_unitfile({
+#             'Unit':{
+#                 'Description': f'{name} timer',
+#             },
+#             'Timer': {
+#                 'OnCalendar': config['when'],
+#                 'Persistent': config.get('persistent', False),
+#                 'Unit': f'{name}.service',
+#             },
+#             'Install': {
+#                 'WantedBy': 'multi-user.target',
+#             }
+#         }),
+#         'triggers': [
+#             'action:systemd-reload',
+#             f'svc_systemd:{name}:restart',
+#         ],
+#     }
+# 
+#     svc_systemd[f'{name}.timer'] = {}
+# #

bundles/systemd-timers/metadata.py

@@ -4,24 +4,42 @@ defaults = {
 
 
 @metadata_reactor.provides(
+    'systemd/units',
     'systemd/services',
 )
-def services(metadata):
+def systemd(metadata):
+    units = {}
+    services = {}
+
+    for name, config in metadata.get('systemd-timers').items():
+        units.update({
+            f'{name}.timer': {
+                'Unit':{
+                    'Description': f'{name} timer',
+                },
+                'Timer': {
+                    'OnCalendar': config['when'],
+                    'Persistent': config.get('persistent', False),
+                    'Unit': f'{name}.service',
+                },
+                'Install': {
+                    'WantedBy': 'multi-user.target',
+                },
+            }, 
+            f'{name}.service': {
+                'Unit':{
+                    'Description': f'{name} timer service',
+                },
+                'Service': {
+                    'ExecStart': config['command'],
+                },
+            },
+        })
+        services[f'{name}.timer'] = {}
+        
     return {
         'systemd': {
-            'services': {
-                name: {
-                    'content': {
-                        'Unit':{
-                            'Description': f'{name} timer service',
-                        },
-                        'Service': {
-                            'ExecStart': config['command'],
-                        },
-                    },
-                    'enabled': False,
-                    'running': False,
-                } for name, config in metadata.get('systemd-timers').items() 
-            },
+            'units': units,
+            'services': services,
         },
     }

bundles/systemd/README.md

@@ -0,0 +1,23 @@
+# SYSTEMD
+
+## metadata
+
+```python
+{
+    'systemd': {
+        'units': {
+            'test.service': {
+                # optional: will be derived from unit extension
+                'path': '/etc/systemd/system/test.service',
+                # content of the unit file
+                'content': {
+                },
+                # bw item data
+                # applies to unitfile and svc_systemd aswell, if present
+                'item': {
+                },
+            }
+        }
+    },
+}
+```

bundles/systemd/items.py

@@ -1,44 +1,41 @@
-timezone = node.metadata.get('timezone', 'UTC')
-keymap = node.metadata.get('keymap', 'de')
+from bundlewrap.utils.dicts import merge_dict
 
 actions = {
      'systemd-reload': {
         'command': 'systemctl daemon-reload',
         'cascade_skip': False,
         'triggered': True,
-        'needed_by': {
-            'svc_systemd:',
-        },
     }, 
 }
 
-for name, service in node.metadata.get('systemd/services').items():
-    # dont call a service 'service' explicitly
-    if name.endswith('.service'):
-        raise Exception(name)
+for name, unit in node.metadata.get('systemd/units').items():
+    extension = name.split('.')[-1]
 
-    # split unit file content data from item data
-    content_data = service.pop('content')
+    if extension in ['netdev', 'network']:
+        path = f'/etc/systemd/network/{name}'
+        dependencies = {
+            'triggers': [
+                'svc_systemd:systemd-networkd:restart',
+            ],
+        }
+    elif extension in ['timer', 'service']:
+        path = f'/etc/systemd/system/{name}'
+        dependencies = {
+            'triggers': [
+                "action:systemd-reload",
+            ],
+        }
+    else:
+        raise Exception(f'unknown unit extension: "{extension}"')
 
-    # default WantedBy=multi-user.target
-    content_data\
-        .setdefault('Install', {})\
-        .setdefault('WantedBy', {'multi-user.target'})
-
-    # create unit file
-    unit_path = f'/etc/systemd/system/{name}.service'
-    files[unit_path] = {
-        'content': repo.libs.systemd.generate_unitfile(content_data),
-        'triggers': [
-            'action:systemd-reload',
-            f'svc_systemd:{name}:restart',
-        ],
+    files[path] = {
+        'content': repo.libs.systemd.generate_unitfile(unit),
+        **dependencies,
     }
 
-    # service depends on unit file
-    service\
-        .setdefault('needs', [])\
-        .append(f'file:{unit_path}')
-
-    # service
-    svc_systemd[name] = service
+for name, config in node.metadata.get('systemd/services').items():
+    svc_systemd[name] = merge_dict(config, {
+        'needs': [
+            'action:systemd-reload',
+        ],
+    })

bundles/systemd/metadata.py

@@ -1,5 +1,26 @@
 defaults = {
     'systemd': {
+        'units': {},
         'services': {},
     }
 }
+
+@metadata_reactor.provides(
+    'systemd/units',
+)
+def services(metadata):
+    units = {}
+    
+    for name, config in metadata.get('systemd/units').items():
+        if name.split('.')[-1] == 'service' and not config.get('Install/WantedBy'):
+            units[name] = {
+                'Install': {
+                    'WantedBy': ['multi-user.target'],
+                }
+            }
+
+    return {
+        'systemd': {
+            'units': units,
+        }
+    }

bundles/wireguard/metadata.py

@@ -26,7 +26,7 @@ defaults = {
 
 
 @metadata_reactor.provides(
-    'systemd-networkd/networks',
+    'systemd/units',
 )
 def systemd_networkd_networks(metadata):
     network = {
@@ -60,16 +60,16 @@ def systemd_networkd_networks(metadata):
             })
 
     return {
-        'systemd-networkd': {
-            'networks': {
-                'wireguard': network,
+        'systemd': {
+            'units': {
+                'wireguard.network':  network,
             },
         },
     }
 
 
 @metadata_reactor.provides(
-    'systemd-networkd/netdevs',
+    'systemd/units',
 )
 def systemd_networkd_netdevs(metadata):
     netdev = {
@@ -99,9 +99,9 @@ def systemd_networkd_netdevs(metadata):
         })
     
     return {
-        'systemd-networkd': {
-            'netdevs': {
-                'wireguard': netdev,
+        'systemd': {
+            'units': {
+                'wireguard.netdev':  netdev,
             },
         },
     }

libs/systemd.py

@@ -23,5 +23,21 @@ ${option}=${str(value)}
 % endfor
 '''
 
+order = [
+    'Unit',
+    'Timer',
+    'Service',
+    'Install',
+]
+
+def segment_order(segment):
+    return (
+        order.index(segment[0]) if segment[0] in order else float('inf'),
+        segment[0]
+    )
+
 def generate_unitfile(data):
-    return Template(template).render(data=data).lstrip()
+    return Template(template).render(
+        data=dict(sorted(data.items(), key=segment_order)),
+        order=order
+    ).lstrip()