From 0ff7d0c497c273d59b1974b65ac60e4ce07caa48 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Sat, 26 Oct 2019 13:52:34 -0400
Subject: [PATCH] Make sure to control stateVersion.
And account for the odd-host-out. :/ See if you can spot it.
---
morph/grid.nix | 6 ++++++
morph/make-storage.nix | 13 ++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/morph/grid.nix b/morph/grid.nix
index 29596afd..1361834e 100644
--- a/morph/grid.nix
+++ b/morph/grid.nix
@@ -19,26 +19,32 @@ import ./make-grid.nix {
"storage000" = import ./make-storage.nix ({
cfg = import ./storage000-config.nix;
hardware = ./storage000-hardware.nix;
+ stateVersion = "19.09";
} // cfg);
"storage001" = import ./make-storage.nix ({
cfg = import ./storage001-config.nix;
hardware = ./storage001-hardware.nix;
+ stateVersion = "19.09";
} // cfg);
"storage002" = import ./make-storage.nix ({
cfg = import ./storage002-config.nix;
hardware = ./storage002-hardware.nix;
+ stateVersion = "19.09";
} // cfg);
"storage003" = import ./make-storage.nix ({
cfg = import ./storage003-config.nix;
hardware = ./storage003-hardware.nix;
+ stateVersion = "19.09";
} // cfg);
"storage004" = import ./make-storage.nix ({
cfg = import ./storage004-config.nix;
hardware = ./storage004-hardware.nix;
+ stateVersion = "19.09";
} // cfg);
"storage005" = import ./make-storage.nix ({
cfg = import ./storage005-config.nix;
hardware = ./storage005-hardware.nix;
+ stateVersion = "19.03";
} // cfg);
};
}
diff --git a/morph/make-storage.nix b/morph/make-storage.nix
index 97c6d89b..d7e0858b 100644
--- a/morph/make-storage.nix
+++ b/morph/make-storage.nix
@@ -3,6 +3,13 @@
, hardware # The path to the hardware configuration for this node.
, publicStoragePort # The storage port number on which to accept connections.
, ristrettoSigningKeyPath # The *local* path to the Ristretto signing key file.
+, stateVersion # The value for system.stateVersion on this node.
+ # This value determines the NixOS release with
+ # which your system is to be compatible, in order
+ # to avoid breaking some software such as
+ # database servers. You should change this only
+ # after NixOS release notes say you should.
+
}: rec {
deployment = {
secrets = {
@@ -51,9 +58,5 @@
ristrettoSigningKeyPath = deployment.secrets.ristretto-signing-key.destination;
};
- # This value determines the NixOS release with which your system is to be
- # compatible, in order to avoid breaking some software such as database
- # servers. You should change this only after NixOS release notes say you
- # should.
- system.stateVersion = "19.09"; # Did you read the comment?
+ system.stateVersion = stateVersion;
}
--
GitLab