From 6e1790bb8bb1660a3f926d61f2ec5818bd932eab Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Wed, 23 Jun 2021 12:48:45 -0400 Subject: [PATCH] Get rid of make-grid since it no longer has any callers --- morph/lib/default.nix | 2 -- morph/lib/make-grid.nix | 19 ------------------- 2 files changed, 21 deletions(-) delete mode 100644 morph/lib/make-grid.nix diff --git a/morph/lib/default.nix b/morph/lib/default.nix index d08e17f2..25ae8eb2 100644 --- a/morph/lib/default.nix +++ b/morph/lib/default.nix @@ -1,8 +1,6 @@ rec { hardware-aws = import ./issuer-aws.nix; - make-grid = import ./make-grid.nix; - issuer = import ./issuer.nix; customize-issuer = import ./customize-issuer.nix; diff --git a/morph/lib/make-grid.nix b/morph/lib/make-grid.nix deleted file mode 100644 index de10df1e..00000000 --- a/morph/lib/make-grid.nix +++ /dev/null @@ -1,19 +0,0 @@ -# Define a function for making a morph configuration for a storage grid. It -# takes two arguments. A string like "Production" giving the name of the grid -# and a function that takes the grid configuration as an argument and returns -# a set of nodes specifying the addresses and NixOS configurations for each -# server in the morph network. -{ name, config, nodes }: -let - pkgs = import <nixpkgs> { }; - # Load our JSON configuration for later use. - cfg = pkgs.lib.trivial.importJSON config; -in -{ - network = { - # Make all of the hosts in this network use the nixpkgs we pinned above. - inherit pkgs; - # This is just for human consumption as far as I can tell. - description = "PrivateStorage.io ${name} Grid"; - }; -} // (nodes cfg) -- GitLab