From 7de4d2690e90d42bf43c47d0e47cd6f531f2cd95 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Mon, 29 Mar 2021 23:27:40 +0100
Subject: [PATCH] blade-router: put radvd config in correct place

---
 ops/nixos/lib/blade-router.nix | 36 +++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/ops/nixos/lib/blade-router.nix b/ops/nixos/lib/blade-router.nix
index db844f24a9..2f0bad7ed0 100644
--- a/ops/nixos/lib/blade-router.nix
+++ b/ops/nixos/lib/blade-router.nix
@@ -127,24 +127,24 @@ with lib;
         virtualRouterId = 2;
       };
     };
-  };
-
-  services.radvd = {
-    enable = true;
-    config = ''
-      interface br-public {
-        AdvSendAdvert on;
-        MinRtrAdvInterval 30;
-        MaxRtrAdvInterval 100;
-        AdvRASrcAddress {
-          ${config.my.blade-router.addresses.br-public-vip.v6-ll.addr};
+  
+    services.radvd = {
+      enable = true;
+      config = ''
+        interface br-public {
+          AdvSendAdvert on;
+          MinRtrAdvInterval 30;
+          MaxRtrAdvInterval 100;
+          AdvRASrcAddress {
+            ${config.my.blade-router.addresses.br-public-vip.v6-ll.addr};
+          };
+          prefix ${config.my.blade-router.addresses.br-public-radvd-prefix.addr}/${toString config.my.blade-router.addresses.br-public-radvd-prefix.prefixLength} {
+            AdvOnLink on;
+            AdvAutonomous on;
+            AdvRouterAddr off;
+          };
         };
-        prefix ${config.my.blade-router.addresses.br-public-radvd-prefix.addr}/${toString config.my.blade-router.addresses.br-public-radvd-prefix.prefixLength} {
-          AdvOnLink on;
-          AdvAutonomous on;
-          AdvRouterAddr off;
-        };
-      };
-    '';
+      '';
+    };
   };
 }