diff --git a/ops/nixos/bvm-ipfs/default.nix b/ops/nixos/bvm-ipfs/default.nix new file mode 100644 index 0000000000..55bce06ed6 --- /dev/null +++ b/ops/nixos/bvm-ipfs/default.nix @@ -0,0 +1,22 @@ +# SPDX-FileCopyrightText: 2020 Luke Granger-Brown +# +# SPDX-License-Identifier: Apache-2.0 + +{ ... }: +{ + imports = [ + ../lib/bvm.nix + ]; + + # Networking! + networking = { + hostName = "bvm-ipfs"; + hostId = "6eca8221"; + + interfaces.enp1s0 = { + ipv4.addresses = [{ address = "10.100.0.203"; prefixLength = 23; }]; + }; + }; + + system.stateVersion = "21.05"; +} diff --git a/ops/nixos/bvm-nixosmgmt/default.nix b/ops/nixos/bvm-nixosmgmt/default.nix index 8429fed219..0f4ce9594a 100644 --- a/ops/nixos/bvm-nixosmgmt/default.nix +++ b/ops/nixos/bvm-nixosmgmt/default.nix @@ -17,6 +17,7 @@ ipv4.addresses = [{ address = "10.100.0.200"; prefixLength = 23; }]; }; }; + my.ip.tailscale = "100.65.226.19"; system.stateVersion = "21.05"; } diff --git a/ops/nixos/bvm-prosody/default.nix b/ops/nixos/bvm-prosody/default.nix new file mode 100644 index 0000000000..cfdf83f60b --- /dev/null +++ b/ops/nixos/bvm-prosody/default.nix @@ -0,0 +1,22 @@ +# SPDX-FileCopyrightText: 2020 Luke Granger-Brown +# +# SPDX-License-Identifier: Apache-2.0 + +{ ... }: +{ + imports = [ + ../lib/bvm.nix + ]; + + # Networking! + networking = { + hostName = "bvm-prosody"; + hostId = "5c62ee63"; + + interfaces.enp1s0 = { + ipv4.addresses = [{ address = "10.100.0.202"; prefixLength = 23; }]; + }; + }; + + system.stateVersion = "21.05"; +} diff --git a/ops/nixos/bvm-twitterchiver/default.nix b/ops/nixos/bvm-twitterchiver/default.nix new file mode 100644 index 0000000000..3a2ad37c40 --- /dev/null +++ b/ops/nixos/bvm-twitterchiver/default.nix @@ -0,0 +1,22 @@ +# SPDX-FileCopyrightText: 2020 Luke Granger-Brown +# +# SPDX-License-Identifier: Apache-2.0 + +{ ... }: +{ + imports = [ + ../lib/bvm.nix + ]; + + # Networking! + networking = { + hostName = "bvm-twitterchiver"; + hostId = "c7ff157c"; + + interfaces.enp1s0 = { + ipv4.addresses = [{ address = "10.100.0.201"; prefixLength = 23; }]; + }; + }; + + system.stateVersion = "21.05"; +} diff --git a/ops/nixos/default.nix b/ops/nixos/default.nix index 97e21dbfd3..267f04cfb9 100644 --- a/ops/nixos/default.nix +++ b/ops/nixos/default.nix @@ -34,6 +34,9 @@ let "frantech-nyc01" "frantech-las01" "bvm-nixosmgmt" + "bvm-twitterchiver" + "bvm-prosody" + "bvm-ipfs" ]; rebuilder = system: (import ./lib/rebuilder.nix (args // { system = system; })); systemCfgs = lib.genAttrs systems diff --git a/ops/nixos/installcd/default.nix b/ops/nixos/installcd/default.nix index ae08de095e..77d12d596d 100644 --- a/ops/nixos/installcd/default.nix +++ b/ops/nixos/installcd/default.nix @@ -12,7 +12,11 @@ in { isoImage.isoName = lib.mkForce "nixos-${depot.version}-${pkgs.stdenv.hostPlatform.system}.iso"; - isoImage.storeContents = lib.mkAfter (builtins.attrValues depot.ops.nixos.systems); + isoImage.storeContents = [ + depot.ops.nixos.systems.bvm-twitterchiver + depot.ops.nixos.systems.bvm-prosody + depot.ops.nixos.systems.bvm-ipfs + ]; system.stateVersion = "21.05"; }