From 5c66b651a46876f14827459cb250cfee9b685b17 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 29 Aug 2019 14:38:57 -0400
Subject: [PATCH] put the storage server port number into a configuration file
---
morph/grid.config.json | 2 ++
morph/staging.nix | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
create mode 100644 morph/grid.config.json
diff --git a/morph/grid.config.json b/morph/grid.config.json
new file mode 100644
index 00000000..71d0fcd9
--- /dev/null
+++ b/morph/grid.config.json
@@ -0,0 +1,2 @@
+{ "publicStoragePort": 8898
+}
diff --git a/morph/staging.nix b/morph/staging.nix
index de578484..71d672f7 100644
--- a/morph/staging.nix
+++ b/morph/staging.nix
@@ -7,7 +7,7 @@ let
url = "https://github.com/NixOS/nixpkgs/archive/3c83ad6ac13b67101cc3e2e07781963a010c1624.tar.gz";
sha256 = "0cdq342wrkvkyccygpp1gvwp7hhqg68hljjwld4vjixm901ayy14";
}) {};
- publicStoragePort = 8898;
+ cfg = pkgs.lib.trivial.importJSON ./grid.config.json;
in
{
network = {
@@ -17,12 +17,12 @@ in
"staging000" = import ./staging000.nix {
publicIPv4 = "3.123.26.90";
- inherit publicStoragePort;
+ inherit (cfg) publicStoragePort;
};
"staging001" = import ./staging001.nix {
publicIPv4 = "209.95.51.251";
- inherit publicStoragePort;
+ inherit (cfg) publicStoragePort;
};
"staging002" = import ./staging002.nix;
--
GitLab