From 8a1a1bd8fdccc6ac03d99305033cd154f1e8e178 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sun, 6 Dec 2020 19:52:32 +0100
Subject: [PATCH] home.router: sort metadata

---
 nodes/home/router.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/nodes/home/router.py b/nodes/home/router.py
index dd9af8f..564050e 100644
--- a/nodes/home/router.py
+++ b/nodes/home/router.py
@@ -3,12 +3,12 @@ from bundlewrap.metadata import atomic
 nodes['home.router'] = {
     'hostname': '172.19.138.1',
     'bundles': {
+        'dhcpd',
         'iptables',
         'netdata',
         'nginx',
         'pppd',
         'radvd',
-        'dhcpd',
         'vnstat',
         'wide-dhcp6c',
         'wireguard',
@@ -42,6 +42,24 @@ nodes['home.router'] = {
             # day.
             'restart_pppd': '23 2 * * *    root    systemctl restart pppoe',
         },
+        'dhcpd': {
+            'subnets': {
+                'home': {
+                    'subnet': '172.19.138.0',
+                    'netmask': '255.255.255.0',
+                    'range_lower':  '172.19.138.100',
+                    'range_higher': '172.19.138.250',
+                    'interface': 'enp1s0.42',
+                    'options': {
+                        'routers': '172.19.138.1',
+                        'domain-name-servers': '8.8.8.8, 8.8.4.4',
+                        'domain-name': 'franzi-home.kunbox.net',
+                        'broadcast-address': '172.19.138.255',
+                        'subnet-mask': '255.255.255.0',
+                    },
+                },
+            },
+        },
         'iptables': {
             'custom_rules': [
                 # This is a router. Allow forwarding traffic for all internal networks.
@@ -90,24 +108,6 @@ nodes['home.router'] = {
                 'password': vault.decrypt('encrypt$gAAAAABfr8Cq5M1hweeJTQAl0dLhFntdlw-QnkIYUQpY-_ycODVWOpyeAwjwOgWLSdsdXIUvqcoiXPZPV-BE12p5C42NGnj9r7sKYpoGz8xfuGIk6haMa2g='),
             },
         },
-        'dhcpd': {
-            'subnets': {
-                'home': {
-                    'subnet': '172.19.138.0',
-                    'netmask': '255.255.255.0',
-                    'range_lower':  '172.19.138.100',
-                    'range_higher': '172.19.138.250',
-                    'interface': 'enp1s0.42',
-                    'options': {
-                        'routers': '172.19.138.1',
-                        'domain-name-servers': '8.8.8.8, 8.8.4.4',
-                        'domain-name': 'franzi-home.kunbox.net',
-                        'broadcast-address': '172.19.138.255',
-                        'subnet-mask': '255.255.255.0',
-                    },
-                },
-            },
-        },
         'users': {
             'f2k1de': {
                 'ssh_pubkey': {