Merge branch 'main' into simplify-network-config

This commit is contained in:
Alex 2023-03-24 15:35:27 +01:00
commit ecfab3c628
2 changed files with 2 additions and 2 deletions

View file

@ -10,7 +10,7 @@
deuxfleurs.hostName = "piranha"; deuxfleurs.hostName = "piranha";
deuxfleurs.staticIPv4.address = "192.168.1.25/24"; 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; deuxfleurs.isRaftServer = true;
system.stateVersion = "22.11"; system.stateVersion = "22.11";

View file

@ -4,7 +4,7 @@
deuxfleurs.siteName = "corrin"; deuxfleurs.siteName = "corrin";
deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1"; deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1";
deuxfleurs.cnameTarget = "corrin.site.staging.deuxfleurs.org."; deuxfleurs.cnameTarget = "corrin.site.staging.deuxfleurs.org.";
deuxfleurs.publicIPv4 = "82.120.233.78"; deuxfleurs.publicIPv4 = "2.13.96.213";
networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.firewall.allowedTCPPorts = [ 80 443 ];
} }