From b9f56c3125d105be2466e336de0a0c1959456556 Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Wed, 20 Nov 2024 15:43:05 +0100 Subject: [PATCH] nfs: the the jumphost --- TODO.md | 7 ++++--- client/desktop.nix | 2 +- machines/nfs/default.nix | 15 +++++++++++---- shared/users.nix | 3 +-- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/TODO.md b/TODO.md index eb1425c..b0ac621 100644 --- a/TODO.md +++ b/TODO.md @@ -1,8 +1,9 @@ # Tasks +- Add readme +- Add SSH Keys +- LDAP tuning +- Default desktop - Lock installer shells -- Allow multiple users to log-in -- Check external SSH access - - Exim recovery - Quota per user on homedir diff --git a/client/desktop.nix b/client/desktop.nix index 052b2ad..1b674c4 100644 --- a/client/desktop.nix +++ b/client/desktop.nix @@ -18,7 +18,7 @@ with lib; desktopManager = { gnome = { - enable = true; + enable = false; # Flashback only debug = true; flashback.enableMetacity = true; diff --git a/machines/nfs/default.nix b/machines/nfs/default.nix index 081dbc1..3752f35 100644 --- a/machines/nfs/default.nix +++ b/machines/nfs/default.nix @@ -6,6 +6,7 @@ ./cache.nix ./netinstaller.nix ./wol.nix + ../../client/users.nix ]; deployment = { @@ -14,10 +15,16 @@ networking = { interfaces."enp4s0f0" = { - ipv4.addresses = [{ - address = "10.33.64.20"; - prefixLength = 20; - }]; + ipv4.addresses = [ + { + address = "10.33.64.20"; + prefixLength = 20; + } + { + address = "10.33.64.71"; + prefixLength = 20; + } + ]; }; interfaces."enp4s0f1" = { diff --git a/shared/users.nix b/shared/users.nix index 9d4db6c..ce4b0f7 100644 --- a/shared/users.nix +++ b/shared/users.nix @@ -4,8 +4,7 @@ users.mutableUsers = false; users.users."root" = { - #TODO: hashedPassword = "$y$j9T$5ZEv2RROIXAqdFjFEXEst0$5HA63fmwjGXw1id4n94TRgY1gTuXsQGKXmzlcWXyE07"; - hashedPassword = "$y$j9T$IqOVsS6/ACfhDXzA3LqsZ1$J/16UDhw44bHWJqIoCdjms6IEwT4tk4ghq2WpThOlMA"; + hashedPassword = "$y$j9T$wXcRddxlkZN3j3QtMWn0O.$RjcHwreNh.zflso8y/gaAZjk61Mm59KEoSQwMlY0zPB"; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2nkarN0+uSuP5sGwDCb9KRu+FCjO/+da4VypGanPUZ fooker@k-2so"