diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix index 88c19818c03287583b45ece80b9f0531f791bfc7..1729425d91bc02f56fa895d04731ffcc74971cbe 100644 --- a/morph/grid/local/grid.nix +++ b/morph/grid/local/grid.nix @@ -13,7 +13,7 @@ let payments = let publicIPv4 = "192.168.67.21"; in { imports = [ gridlib.issuer - (import ./virtual-hardware.nix ({ inherit publicIPv4; })) + (gridlib.hardware-virtual ({ inherit publicIPv4; })) (gridlib.customize-issuer (config // { monitoringvpnIPv4 = "172.23.23.11"; })) @@ -23,7 +23,7 @@ let storage1 = let publicIPv4 = "192.168.67.22"; in { imports = [ gridlib.storage - (import ./virtual-hardware.nix ({ inherit publicIPv4; })) + (gridlib.hardware-virtual ({ inherit publicIPv4; })) (gridlib.customize-storage (config // { inherit publicIPv4; monitoringvpnIPv4 = "172.23.23.12"; @@ -35,7 +35,7 @@ let storage2 = let publicIPv4 = "192.168.67.23"; in { imports = [ gridlib.storage - (import ./virtual-hardware.nix ({ inherit publicIPv4; })) + (gridlib.hardware-virtual ({ inherit publicIPv4; })) (gridlib.customize-storage (config // { inherit publicIPv4; monitoringvpnIPv4 = "172.23.23.13"; @@ -47,7 +47,7 @@ let monitoring = let publicIPv4 = "192.168.67.24"; in { imports = [ gridlib.monitoring - (import ./virtual-hardware.nix ({ inherit publicIPv4; })) + (gridlib.hardware-virtual ({ inherit publicIPv4; })) (gridlib.customize-monitoring { inherit hostsMap publicIPv4 vpnClientIPs nodeExporterTargets; inherit (config) monitoringvpnKeyDir; diff --git a/morph/lib/default.nix b/morph/lib/default.nix index 72d30dd658b7902f65037ac416686c10aa5f290a..bdd92f4bfe52eba2e19df3ac73a087a4af4a53dc 100644 --- a/morph/lib/default.nix +++ b/morph/lib/default.nix @@ -3,6 +3,7 @@ # directly importing the source files in this directory. { hardware-aws = import ./issuer-aws.nix; + hardware-virtual = import ./hardware-virtual.nix; issuer = import ./issuer.nix; customize-issuer = import ./customize-issuer.nix; diff --git a/morph/grid/local/virtual-hardware.nix b/morph/lib/hardware-virtual.nix similarity index 100% rename from morph/grid/local/virtual-hardware.nix rename to morph/lib/hardware-virtual.nix diff --git a/morph/grid/local/vagrant-guest.nix b/morph/lib/vagrant-guest.nix similarity index 100% rename from morph/grid/local/vagrant-guest.nix rename to morph/lib/vagrant-guest.nix