From 7bbe7de526001b6e0681aee8c88c73b3c0da6748 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 28 Dec 2023 20:41:17 +0100
Subject: [PATCH] dn42: peer with welterde

---
 flake.lock              | 8 ++++----
 hosts/dn42/default.nix  | 4 +++-
 hosts/dn42/secrets.yaml | 9 ++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5c21c4b9..5fe9d8c5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -561,11 +561,11 @@
     },
     "secrets": {
       "locked": {
-        "lastModified": 1699654813,
-        "narHash": "sha256-cZH9FL8DOSZvLWL8jWiNszeV/g5eHJw80L88R8dPjvI=",
+        "lastModified": 1703791905,
+        "narHash": "sha256-fGijSNBMDmzrq4q0ugAsVmt8T71bAym8pI7jIvf1lGI=",
         "ref": "refs/heads/master",
-        "rev": "f4d44f2c75f149c4aeadb635348ee87db4448b86",
-        "revCount": 164,
+        "rev": "879a0cbb1eab87a51b9b754d29a6b44bca0e3ab9",
+        "revCount": 165,
         "type": "git",
         "url": "ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git"
       },
diff --git a/hosts/dn42/default.nix b/hosts/dn42/default.nix
index 889d9a46..67675d5c 100644
--- a/hosts/dn42/default.nix
+++ b/hosts/dn42/default.nix
@@ -92,7 +92,9 @@ in
         '';
         up = ''
           ${pkgs.iproute}/bin/ip addr flush dev $1
-          ${pkgs.iproute}/bin/ip addr add ${address4} dev ${name} peer ${conf.address4}/32
+          ${lib.optionalString (conf ? address4) ''
+            ${pkgs.iproute}/bin/ip addr add ${address4} dev ${name} peer ${conf.address4}/32
+          ''}
           ${pkgs.iproute}/bin/ip addr add ${address6}/64 dev $1
         '';
       };
diff --git a/hosts/dn42/secrets.yaml b/hosts/dn42/secrets.yaml
index 54d006b4..73d159ef 100644
--- a/hosts/dn42/secrets.yaml
+++ b/hosts/dn42/secrets.yaml
@@ -29,6 +29,9 @@ neighbors:
     dc4242423804:
         wireguard:
             privateKey: ENC[AES256_GCM,data:O04wJJ+YIbyXgNbr5Z6T1uFr/8xQDK28Hciu1hLu3cf48c4efSro5aCyXYA=,iv:lOoTvVpqb6lSUDXi/EIIXlLjFbd44hCgzmPUVllRrVg=,tag:KHWh1a6JjjSRvYcv2onVGA==,type:str]
+    dc64738:
+        wireguard:
+            privateKey: ENC[AES256_GCM,data:br0ZyD3yU0Ix+JyXntbsbogtvRmBVE1DCIuE4DHZy5Ha+VFiXf49oAcqq1A=,iv:wvdYurVY7UG9XcutsEAOkFzGYod85lUdcbDkbEcAf2w=,tag:zZdIEoJxaJ/FffGngOWVEA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -53,8 +56,8 @@ sops:
             UW9MRTM0M0RiUDRVQTE3bGxaeGNuWWsKMwFqlntiTNn/5pFpEFyuKvyKJPUJFXui
             7W5COcr0Gzcy9Jvho/RoJVptCNjt1am8GNvayN61BtL2AvxqmM5s3Q==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2022-01-06T22:45:31Z"
-    mac: ENC[AES256_GCM,data:6ooG3L6RBMn+DZ4jFsmc1WuS7Pu2hkYM74uGu6lxGEwwOqTPXsEAORtcMdTeCL2OtDKZradmMqcGPNJwm0MrHNwemgmmfn9GGHjM44SfyIdApa9H8Gpql06QjpcX/r7H8XXdvJT6YpwBX7S5htO0kyJc6P0435dg275Jl8m8+bY=,iv:nH3Gz/h0Ikq9kV7n0nHH7fxYuDoPHqwZsdLlAngZopQ=,tag:UJVpBYg+7sjiGqODirON1g==,type:str]
+    lastmodified: "2023-12-28T19:31:34Z"
+    mac: ENC[AES256_GCM,data:TP3PEqnZjVHpa3rOVc2+J5wu+FKszhu7+LcoUBeW1mUPxbzx6GWn94E4ctC1laM5kPeBY4FyPbX1kR2PXOhi2s87+7grUT+7QinxeasOpk1o2f+2nNNdF78GVr6ulc/rx9K/bN6K2GKbxgqLkCIAdqDXVDE2ya2+C3FFmElNv/M=,iv:4LoAzPHFKxkNDW+bPo0rUT+i8pYnbTShZMubHjld6RQ=,tag:/FMSOigpoouyAAlNjec+uQ==,type:str]
     pgp:
         - created_at: "2023-08-08T22:43:28Z"
           enc: |
@@ -194,4 +197,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: DD0998E6CDF294537FC604F991FA5E5BF9AA901C
     unencrypted_suffix: _unencrypted
-    version: 3.7.1
+    version: 3.8.1