From 645e30ce08ebb1d3aac3478f20b8702509c08498 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@privatestorage.io>
Date: Tue, 15 Jun 2021 21:10:21 +0000
Subject: [PATCH] Add the same 8 GB of encrypted swap space to all hosts
For consistency reasons: Even if they had a perfectly good swap
partition already, and also for AWS hosts.
---
morph/grid/production/storage001-hardware.nix | 9 ++++++---
morph/grid/production/storage002-hardware.nix | 8 +++++---
morph/grid/production/storage003-hardware.nix | 6 +++++-
morph/grid/production/storage004-hardware.nix | 6 +++++-
morph/grid/production/storage005-hardware.nix | 6 +++++-
morph/grid/testing/testing001-hardware.nix | 6 ++++++
morph/lib/issuer-aws.nix | 5 +++++
7 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/morph/grid/production/storage001-hardware.nix b/morph/grid/production/storage001-hardware.nix
index 49809465..b2ca97c1 100644
--- a/morph/grid/production/storage001-hardware.nix
+++ b/morph/grid/production/storage001-hardware.nix
@@ -31,9 +31,12 @@
fsType = "zfs";
};
- swapDevices =
- [ { device = "/dev/disk/by-uuid/f986a811-4912-4e9a-8bc3-01cb6926c4c6"; }
- ];
+ swapDevices = [ {
+ device = "/var/swapfile";
+ size = 8192; # megabytes
+ randomEncryption = true;
+ } ];
+
nix.maxJobs = lib.mkDefault 24;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/morph/grid/production/storage002-hardware.nix b/morph/grid/production/storage002-hardware.nix
index 64defbb7..2f354ad2 100644
--- a/morph/grid/production/storage002-hardware.nix
+++ b/morph/grid/production/storage002-hardware.nix
@@ -31,9 +31,11 @@
fsType = "ext4";
};
- swapDevices =
- [ { device = "/dev/disk/by-uuid/f762b5e2-bbdd-4a02-bbd9-0bf6b11e0ab5"; }
- ];
+ swapDevices = [ {
+ device = "/var/swapfile";
+ size = 8192; # megabytes
+ randomEncryption = true;
+ } ];
nix.maxJobs = lib.mkDefault 24;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/morph/grid/production/storage003-hardware.nix b/morph/grid/production/storage003-hardware.nix
index 1661e354..83a37d9e 100644
--- a/morph/grid/production/storage003-hardware.nix
+++ b/morph/grid/production/storage003-hardware.nix
@@ -31,7 +31,11 @@
fsType = "zfs";
};
- swapDevices = [ ];
+ swapDevices = [ {
+ device = "/var/swapfile";
+ size = 8192; # megabytes
+ randomEncryption = true;
+ } ];
nix.maxJobs = lib.mkDefault 24;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/morph/grid/production/storage004-hardware.nix b/morph/grid/production/storage004-hardware.nix
index bc66beec..1fe78a76 100644
--- a/morph/grid/production/storage004-hardware.nix
+++ b/morph/grid/production/storage004-hardware.nix
@@ -26,7 +26,11 @@
fsType = "zfs";
};
- swapDevices = [ ];
+ swapDevices = [ {
+ device = "/var/swapfile";
+ size = 8192; # megabytes
+ randomEncryption = true;
+ } ];
nix.maxJobs = lib.mkDefault 32;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/morph/grid/production/storage005-hardware.nix b/morph/grid/production/storage005-hardware.nix
index ad8dc69c..e8f7b639 100644
--- a/morph/grid/production/storage005-hardware.nix
+++ b/morph/grid/production/storage005-hardware.nix
@@ -31,7 +31,11 @@
fsType = "zfs";
};
- swapDevices = [ ];
+ swapDevices = [ {
+ device = "/var/swapfile";
+ size = 8192; # megabytes
+ randomEncryption = true;
+ } ];
nix.maxJobs = lib.mkDefault 32;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/morph/grid/testing/testing001-hardware.nix b/morph/grid/testing/testing001-hardware.nix
index 3943a375..dd2f9733 100644
--- a/morph/grid/testing/testing001-hardware.nix
+++ b/morph/grid/testing/testing001-hardware.nix
@@ -2,6 +2,12 @@
imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ];
ec2.hvm = true;
boot.kernel.sysctl = { "vm.swappiness" = 0; };
+ swapDevices = [ {
+ device = "/var/swapfile";
+ size = 8192; # megabytes
+ randomEncryption = true;
+ } ];
+
boot.supportedFilesystems = [ "zfs" ];
networking.hostId = "10000000";
diff --git a/morph/lib/issuer-aws.nix b/morph/lib/issuer-aws.nix
index 349eb076..15ae9cda 100644
--- a/morph/lib/issuer-aws.nix
+++ b/morph/lib/issuer-aws.nix
@@ -2,4 +2,9 @@
imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ];
ec2.hvm = true;
boot.kernel.sysctl = { "vm.swappiness" = 0; };
+ swapDevices = [ {
+ device = "/var/swapfile";
+ size = 8192; # megabytes
+ randomEncryption = true;
+ } ];
}
--
GitLab