diff --git a/hosts/plato.nix b/hosts/plato.nix index de2e4c2..aee09d1 100644 --- a/hosts/plato.nix +++ b/hosts/plato.nix @@ -1,5 +1,5 @@ { - description = "Niten's toy server."; + description = "Deploy Server #2"; rp = "niten"; admin-email = "niten@fudo.org"; domain = "sea.fudo.org"; diff --git a/hosts/wormhole0.nix b/hosts/wormhole0.nix new file mode 100644 index 0000000..384aa69 --- /dev/null +++ b/hosts/wormhole0.nix @@ -0,0 +1,17 @@ +{ + description = "Wireless Network Wormhole."; + rp = "niten"; + admin-email = "niten@fudo.org"; + domain = "sea.fudo.org"; + site = "seattle"; + profile = "server"; + tmp-on-tmpfs = true; + arch = "x86_64-linux"; + nixos-system = true; + machine-id = "27f12473c9c74638b8c40d2a5ef9366c"; + master-key = { + public-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICgAzn6gyG1ze7L1WLU84poPGcoUntqfvgn+/s3bxhR2"; + key-path = "/state/master-key/key"; + }; + hardened = true; +} diff --git a/sites/nuttyclub.nix b/sites/nuttyclub.nix index 19a90d2..8b6490c 100644 --- a/sites/nuttyclub.nix +++ b/sites/nuttyclub.nix @@ -1,6 +1,7 @@ { gateway-v4 = "199.87.154.174"; network = "199.87.154.174/31"; + private-network = "10.1.0.0/16"; nameservers = [ "1.1.1.1" ]; timezone = "America/Winnipeg"; deploy-pubkeys = [ diff --git a/sites/portage.nix b/sites/portage.nix index 27365b7..96c6e56 100644 --- a/sites/portage.nix +++ b/sites/portage.nix @@ -1,6 +1,7 @@ { gateway-v4 = "208.81.3.113"; network = "208.81.3.112/28"; + private-network = "10.2.0.0/16;" nameservers = [ "208.81.7.14" "1.1.1.1" ]; timezone = "America/Winnipeg"; deploy-pubkeys = [ diff --git a/sites/russell.nix b/sites/russell.nix index cc444b6..91108ad 100644 --- a/sites/russell.nix +++ b/sites/russell.nix @@ -1,8 +1,7 @@ { - gateway-v4 = "10.0.0.1"; - nameservers = [ "10.0.0.1" ]; - network = "10.0.0.0/16"; - dynamic-network = "10.0.1.0/24"; + private-network = "10.3.0.0/16"; + dynamic-network = "10.3.100.0/24"; timezone = "America/Winnipeg"; mail-server = "mail.fudo.org"; + local-gateway = "clunk"; } diff --git a/sites/seattle.nix b/sites/seattle.nix index c1b468c..f980154 100644 --- a/sites/seattle.nix +++ b/sites/seattle.nix @@ -1,7 +1,6 @@ -{ config, lib, pkgs, ... }: - { network = "10.0.0.0/16"; + private-network = "10.0.0.0/16"; dynamic-network = "10.0.100.0/24"; timezone = "America/Los_Angeles"; deploy-pubkeys = [ diff --git a/sites/worldstream.nix b/sites/worldstream.nix index e53a627..4435e9d 100644 --- a/sites/worldstream.nix +++ b/sites/worldstream.nix @@ -1,6 +1,7 @@ { gateway-v4 = "91.229.23.1"; network = "91.229.23.0/24"; + private-network = "10.3.0.0/16"; nameservers = [ "1.1.1.1" "2606:4700:4700::1111" ]; timezone = "Europe/Amsterdam"; deploy-pubkeys = [ diff --git a/zones/sea.fudo.org.nix b/zones/sea.fudo.org.nix index f83e67f..a3b285f 100644 --- a/zones/sea.fudo.org.nix +++ b/zones/sea.fudo.org.nix @@ -86,7 +86,8 @@ in { ipv4-address = "10.0.0.20"; mac-address = "02:f2:30:b8:71:42"; }; - plato = { ipv4-address = "10.0.0.21"; }; + plato.ipv4-address = "10.0.0.21"; + wormhole0.ipv4-address = "10.0.0.3"; cam-entrance = {