From 3f07e7dbd7463f89b23e75d2c6c7f9967fef0a83 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sun, 2 Mar 2025 17:36:49 +0100
Subject: [PATCH] hosts/dn42-il*: Migrate bird config to new module name
---
hosts/dn42-il-gw1/configuration.nix | 5 +++--
hosts/dn42-il-gw5/configuration.nix | 5 +++--
hosts/dn42-il-gw6/configuration.nix | 5 +++--
hosts/dn42-ildix-clerie/configuration.nix | 5 +++--
hosts/dn42-ildix-service/bird.nix | 7 ++++---
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/hosts/dn42-il-gw1/configuration.nix b/hosts/dn42-il-gw1/configuration.nix
index 9d2c07c..962dc65 100644
--- a/hosts/dn42-il-gw1/configuration.nix
+++ b/hosts/dn42-il-gw1/configuration.nix
@@ -179,8 +179,9 @@
];
};
- services.bird2.enable = true;
- services.bird2.config = ''
+ services.bird.enable = true;
+ services.bird.package = pkgs.bird2;
+ services.bird.config = ''
router id ${ (lib.head config.networking.interfaces.ens18.ipv4.addresses).address };
ipv6 table ospf6;
diff --git a/hosts/dn42-il-gw5/configuration.nix b/hosts/dn42-il-gw5/configuration.nix
index 133314d..1e38648 100644
--- a/hosts/dn42-il-gw5/configuration.nix
+++ b/hosts/dn42-il-gw5/configuration.nix
@@ -37,8 +37,9 @@
];
};
- services.bird2.enable = true;
- services.bird2.config = ''
+ services.bird.enable = true;
+ services.bird.package = pkgs.bird2;
+ services.bird.config = ''
router id ${ (lib.head config.networking.interfaces.ens18.ipv4.addresses).address };
ipv6 table ospf6;
diff --git a/hosts/dn42-il-gw6/configuration.nix b/hosts/dn42-il-gw6/configuration.nix
index 967eb0d..69acba4 100644
--- a/hosts/dn42-il-gw6/configuration.nix
+++ b/hosts/dn42-il-gw6/configuration.nix
@@ -37,8 +37,9 @@
];
};
- services.bird2.enable = true;
- services.bird2.config = ''
+ services.bird.enable = true;
+ services.bird.package = pkgs.bird2;
+ services.bird.config = ''
router id ${ (lib.head config.networking.interfaces.ens20.ipv4.addresses).address };
ipv6 table ospf6;
diff --git a/hosts/dn42-ildix-clerie/configuration.nix b/hosts/dn42-ildix-clerie/configuration.nix
index 14e6387..e8f4f36 100644
--- a/hosts/dn42-ildix-clerie/configuration.nix
+++ b/hosts/dn42-ildix-clerie/configuration.nix
@@ -33,8 +33,9 @@
iptables -A INPUT -p ospfigp -j ACCEPT
'';
- services.bird2.enable = true;
- services.bird2.config = ''
+ services.bird.enable = true;
+ services.bird.package = pkgs.bird2;
+ services.bird.config = ''
router id ${ (lib.head config.networking.interfaces.ens18.ipv4.addresses).address };
protocol direct {
diff --git a/hosts/dn42-ildix-service/bird.nix b/hosts/dn42-ildix-service/bird.nix
index 5a46e41..caf2b8c 100644
--- a/hosts/dn42-ildix-service/bird.nix
+++ b/hosts/dn42-ildix-service/bird.nix
@@ -1,11 +1,12 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
{
networking.firewall.allowedTCPPorts = [ 179 ];
# something doesn't work right
- services.bird2.enable = false;
- services.bird2.config = ''
+ services.bird.enable = false;
+ services.bird.package = pkgs.bird2;
+ services.bird.config = ''
router id ${(lib.head config.networking.interfaces.ens18.ipv4.addresses).address};
ipv6 table bgp6;