aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-03-24 15:35:27 +0100
committerAlex Auvolat <alex@adnab.me>2023-03-24 15:35:27 +0100
commitecfab3c628baa11acefdb678c16466d644b73796 (patch)
tree278d5b8afa6e1de59ed1f44fc789d3e4d7e964be
parent96566ae523934f5a37b8d7c2a9ef928cd5c0d098 (diff)
parent8ae9ec65148378bbd97bd6c83fa58832b8516407 (diff)
downloadnixcfg-ecfab3c628baa11acefdb678c16466d644b73796.tar.gz
nixcfg-ecfab3c628baa11acefdb678c16466d644b73796.zip
Merge branch 'main' into simplify-network-config
-rw-r--r--cluster/staging/node/piranha.nix2
-rw-r--r--cluster/staging/site/corrin.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/cluster/staging/node/piranha.nix b/cluster/staging/node/piranha.nix
index 436965c..2b9907d 100644
--- a/cluster/staging/node/piranha.nix
+++ b/cluster/staging/node/piranha.nix
@@ -10,7 +10,7 @@
deuxfleurs.hostName = "piranha";
deuxfleurs.staticIPv4.address = "192.168.1.25/24";
- deuxfleurs.ipv6Address = "2a01:cb05:8984:9900:223:24ff:feb0:ea82";
+ deuxfleurs.ipv6Address = "2a01:cb05:9142:7400:223:24ff:feb0:ea82";
deuxfleurs.isRaftServer = true;
system.stateVersion = "22.11";
diff --git a/cluster/staging/site/corrin.nix b/cluster/staging/site/corrin.nix
index 0083986..6eb5239 100644
--- a/cluster/staging/site/corrin.nix
+++ b/cluster/staging/site/corrin.nix
@@ -4,7 +4,7 @@
deuxfleurs.siteName = "corrin";
deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1";
deuxfleurs.cnameTarget = "corrin.site.staging.deuxfleurs.org.";
- deuxfleurs.publicIPv4 = "82.120.233.78";
+ deuxfleurs.publicIPv4 = "2.13.96.213";
networking.firewall.allowedTCPPorts = [ 80 443 ];
}