nixos

commit 1c382c157eba7b068606a878e09c3fbfd6dcdafa
parent 4adf6c84ceaef8b5865f05856a69553c018936b0
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 28 Jan 2024 20:13:08 +0100

Working on opnsense

Diffstat:
M
nixos/worker-1/configuration.nix
 | 
21
+++++++++++----------
M
nixos/worker-2/configuration.nix
 | 
21
+++++++++++----------

2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -457,19 +457,19 @@ in {
     bird2 = {
       enable = false;
       config = ''
-        router id 10.0.1.1;
+        router id 10.0.2.3;
         debug protocols all;
         ## Boilerplate from distro
         log syslog all;
 
         protocol direct direct2 {
           ipv4;
-          interface "gre_*";
+          interface "enp7s0";
         }
 
         protocol device {
           scan time 10;
-          interface "gre_*", "floating1";
+          interface "enp7s0", "floating1";
         }
 
         protocol kernel {
@@ -488,9 +488,10 @@ in {
         }
 
         protocol babel {
-          randomize router id yes;
-          interface "gre_*" {
-            type wired;
+          area 0.0.0.0 {
+            interface "enp7s0" {
+              type broadcast;
+            };
           };
           ipv4 {
             import all;
@@ -502,12 +503,12 @@ in {
 
     bird-lg = {
       proxy = {
-        enable = false;
-        allowedIPs = ["10.0.2.1" "fe99:13::1"];
-        listenAddress = "10.0.2.1:8000";
+        enable = true;
+        allowedIPs = ["10.0.2.2" "fe99:13::1"];
+        listenAddress = "10.0.2.3:8000";
       };
       frontend = {
-        enable = false;
+        enable = true;
         titleBrand = "Midnightthoughts infra";
         navbar.brand = "Midnightthoughts infra";
         listenAddress = "127.0.0.1:5001";
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -665,7 +665,7 @@ in {
     };
 
     bird2 = {
-      enable = false;
+      enable = true;
       config = ''
         router id 10.0.2.2;
         debug protocols all;
@@ -674,12 +674,12 @@ in {
 
         protocol device {
           scan time 10;
-          interface "gre_*";
+          interface "enp7s0";
         }
 
         protocol direct direct2 {
           ipv4;
-          interface "gre_*";
+          interface "enp7s0";
         }
 
         protocol kernel {
@@ -696,10 +696,11 @@ in {
           };
           learn yes;
         }
-        protocol babel {
-          randomize router id yes;
-          interface "gre_*" {
-            type wired;
+        protocol ospf OSPF {
+          area 0.0.0.0 {
+            interface "enp7s0" {
+              type broadcast;
+            };
           };
           ipv4 {
             import all;
@@ -711,9 +712,9 @@ in {
 
     bird-lg = {
       proxy = {
-        enable = false;
-        allowedIPs = ["10.0.2.1"];
-        listenAddress = "10.0.2.2:8000";
+        enable = true;
+        allowedIPs = ["10.0.2.2"];
+        listenAddress = "10.0.2.3:8000";
       };
     };
   };