aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2022-08-24 11:06:55 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2022-08-24 11:06:55 +0200
commit9e39677e1d17ef03ea8ccb4feda15e2eb30be55a (patch)
tree5a5743ccdc3b1d2e84e079627ac9b01e8f224839
parente50e1c407d9a52cf78e0deae6cf79d5ba29c010c (diff)
downloadnixcfg-9e39677e1d17ef03ea8ccb4feda15e2eb30be55a.tar.gz
nixcfg-9e39677e1d17ef03ea8ccb4feda15e2eb30be55a.zip
Fix IPv6
-rw-r--r--cluster/prod/site/orion.nix1
-rw-r--r--nix/deuxfleurs.nix11
-rw-r--r--ssh_known_hosts3
3 files changed, 14 insertions, 1 deletions
diff --git a/cluster/prod/site/orion.nix b/cluster/prod/site/orion.nix
index 5a521d0..acc905a 100644
--- a/cluster/prod/site/orion.nix
+++ b/cluster/prod/site/orion.nix
@@ -3,6 +3,7 @@
{
deuxfleurs.site_name = "orion";
deuxfleurs.lan_default_gateway = "192.168.1.254";
+ deuxfleurs.ipv6_default_gateway = "2a01:e0a:28f:5e60::1";
deuxfleurs.lan_ip_prefix_length = 24;
deuxfleurs.ipv6_prefix_length = 64;
deuxfleurs.nameservers = [ "192.168.1.254" ];
diff --git a/nix/deuxfleurs.nix b/nix/deuxfleurs.nix
index 8be16af..7c2919c 100644
--- a/nix/deuxfleurs.nix
+++ b/nix/deuxfleurs.nix
@@ -79,7 +79,11 @@ in
# Parameters that generally vary between sites
lan_default_gateway = mkOption {
- description = "IP address of the default route on the locak network interface";
+ description = "IPv4 address of the default route on the local network interface";
+ type = types.str;
+ };
+ ipv6_default_gateway = mkOption {
+ description = "IPv6 address of the default IPv6 gateway for the targeted net interface";
type = types.str;
};
site_name = mkOption {
@@ -151,6 +155,11 @@ in
interface = cfg.network_interface;
};
+ networking.defaultGateway6 = {
+ address = cfg.ipv6_default_gateway;
+ interface = cfg.network_interface;
+ };
+
networking.nameservers = [
cfg.lan_ip
] ++ cfg.nameservers;
diff --git a/ssh_known_hosts b/ssh_known_hosts
index cc907be..2104ac9 100644
--- a/ssh_known_hosts
+++ b/ssh_known_hosts
@@ -6,3 +6,6 @@
2a06:a004:3024::21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx
2a06:a004:3024::22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ
192.168.1.23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE2QRbcclYmteMRLIaxOBBBQe/OGF1T+PtSAR249r4VM
+doradille.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzVJB1XYBC/rMxb7UfAoCzKH/l6oE4NKsSErCv2wV94
+dahlia.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQsdIYUn4njMRAuT0/8GzqGn6zGn9014BAkT7VSVf2H
+diplotaxis.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcVtfOj0ti6eYsFSq2gbBGhaf8E7p/QiO3/MVX1D32T