From 805f9ace72b9b8c5b80fd91a0b189e092b1810ce Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 28 May 2024 14:06:33 +0100 Subject: [PATCH] parametised disk formatting and fixed secrets issue in bootstrapping --- flake.lock | 20 ++++---- home/common/core/default.nix | 1 + hosts/bootstrap/default.nix | 9 ++-- hosts/common/core/default.nix | 1 + hosts/common/disks/gpt-bios-compact.nix | 2 +- hosts/common/optional/persistence.nix | 2 + hosts/fileserver/default.nix | 2 - hosts/nixdev/default.nix | 3 -- hosts/sparky/default.nix | 1 - scripts/bootstrap.sh | 64 ++++++++----------------- 10 files changed, 41 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index da2fac3..b192a7d 100644 --- a/flake.lock +++ b/flake.lock @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1716736760, - "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", + "lastModified": 1716847642, + "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", + "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "nix-secrets": { "flake": false, "locked": { - "lastModified": 1716823135, - "narHash": "sha256-2+nqAgrQ11TRNKsMR3eTRrBWfRKBSxEl500g8fL5WgI=", + "lastModified": 1716900655, + "narHash": "sha256-YQBKCTcP+CKP0LWSjVlP+qQ4kbk8ZWjir/nTPIl4+Bs=", "ref": "refs/heads/master", - "rev": "3685717aaa6091e50eb2018b9375b07cf33780a6", - "revCount": 64, + "rev": "c000be534d2c23315a746555e82a30b512c42f65", + "revCount": 69, "type": "git", "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git" }, @@ -327,11 +327,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1716814660, - "narHash": "sha256-lDy4PXkwQs3qBxVCdwOcNDJbWBCMJcoGfsHnr3U3Okg=", + "lastModified": 1716833970, + "narHash": "sha256-K3tVrTna4EN86GW9IeOQJkbj57zT2xNGJg1hh26xy5c=", "owner": "nix-community", "repo": "nixvim", - "rev": "4175fac0ea144679b9818bfc3c7becfbd68e25a4", + "rev": "a2afa5634495ee739e682e5ccb743c5c6dd90ec1", "type": "github" }, "original": { diff --git a/home/common/core/default.nix b/home/common/core/default.nix index df84dac..c6b039b 100644 --- a/home/common/core/default.nix +++ b/home/common/core/default.nix @@ -8,4 +8,5 @@ home.packages = [ pkgs.ripgrep ]; + home.stateVersion = "23.11"; } diff --git a/hosts/bootstrap/default.nix b/hosts/bootstrap/default.nix index b148db8..e85fc1a 100644 --- a/hosts/bootstrap/default.nix +++ b/hosts/bootstrap/default.nix @@ -3,6 +3,8 @@ let pubKeys = lib.filesystem.listFilesRecursive (../common/users/keys); secretsDirectory = builtins.toString inputs.nix-secrets; secretsFile = "${secretsDirectory}/secrets.yaml"; + sopsHashedPasswordFile = lib.optionalString (lib.hasAttr "sops-nix" inputs) config.sops.secrets."passwords/root".path; + hasOptinPersistence = config.environment.persistence ? "/persist"; # Disko setup fsType = "btrfs"; @@ -48,7 +50,6 @@ in files = [ "/etc/ssh/ssh_host_ed25519_key" "/etc/ssh/ssh_host_ed25519_key.pub" - "/etc/ssh/deploy_key-ssh-ed25519" ]; }; @@ -72,7 +73,7 @@ in mutableUsers = true; extraUsers = { root = { - initialPassword = "1234"; + hashedPasswordFile = sopsHashedPasswordFile; openssh.authorizedKeys.keys = lib.lists.forEach pubKeys (key: builtins.readFile key); }; }; @@ -89,7 +90,7 @@ in validateSopsFiles = false; age = { - sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + sshKeyPaths = [ "${lib.optionalString hasOptinPersistence "/persist"}/etc/ssh/ssh_host_ed25519_key" ]; }; secrets = { "passwords/root".neededForUsers = true; @@ -112,7 +113,7 @@ in ports = [22]; authorizedKeysFiles = lib.mkForce ["/etc/ssh/authorized_keys.d/%u"]; hostKeys = [{ - path = "/persist/etc/ssh/ssh_host_ed25519_key"; + path = "${lib.optionalString hasOptinPersistence "/persist"}/persist/etc/ssh/ssh_host_ed25519_key"; type = "ed25519"; }]; settings = { diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix index 1b554d3..7b62e43 100644 --- a/hosts/common/core/default.nix +++ b/hosts/common/core/default.nix @@ -43,4 +43,5 @@ in pkgs.vim ]; + system.stateVersion = "23.11"; } diff --git a/hosts/common/disks/gpt-bios-compact.nix b/hosts/common/disks/gpt-bios-compact.nix index 80a0e46..9f256ff 100644 --- a/hosts/common/disks/gpt-bios-compact.nix +++ b/hosts/common/disks/gpt-bios-compact.nix @@ -3,7 +3,7 @@ disko.devices = { disk = { vda = { - device = "/dev/vda"; + inherit device; type = "disk"; content = { type = "gpt"; diff --git a/hosts/common/optional/persistence.nix b/hosts/common/optional/persistence.nix index 7793c4c..9aa79c0 100644 --- a/hosts/common/optional/persistence.nix +++ b/hosts/common/optional/persistence.nix @@ -9,9 +9,11 @@ "/var/lib/systemd/coredump" "/etc/NetworkManager/system-connections" "/var/lib/flatpak" + "/run/secrets-for-users" ]; files = [ "/etc/ssh/ssh_host_ed25519_key" + "/etc/ssh/deploy_key-ssh-ed25519" "/etc/ssh/ssh_host_ed25519_key.pub" ]; }; diff --git a/hosts/fileserver/default.nix b/hosts/fileserver/default.nix index 929ba79..ddbc415 100644 --- a/hosts/fileserver/default.nix +++ b/hosts/fileserver/default.nix @@ -46,7 +46,5 @@ enableSSHSupport = true; }; - system.stateVersion = "23.11"; - } diff --git a/hosts/nixdev/default.nix b/hosts/nixdev/default.nix index 7ca3b2d..e4b2223 100644 --- a/hosts/nixdev/default.nix +++ b/hosts/nixdev/default.nix @@ -30,8 +30,5 @@ in }; services.libinput.enable = true; - - system.stateVersion = "23.11"; - } diff --git a/hosts/sparky/default.nix b/hosts/sparky/default.nix index 6156f91..7b30bd8 100644 --- a/hosts/sparky/default.nix +++ b/hosts/sparky/default.nix @@ -54,5 +54,4 @@ in cinnamon.enable = true; }; }; - } diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1c581a0..963e93e 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -4,9 +4,10 @@ echo -e " Before using this tool, ensure that the host has been setup correctly. Boot the latest Nixos-minimal install ISO on the host and access the tty. -Use 'ip a' to get the ip address, then 'sudo su' to change to root. Finally -Run 'passwd' and set a temporary password (something simple like '1234') -for the root user. +Use 'ip a' to get the ip address, then 'sudo su' to change to root. Finally Run +'passwd' and set a temporary password for the root user. + +Also, ensure secrets for the new host and users have been set in secrets.yaml " read -p "Confirm host had been setup using the above steps...(yes|no): " confirm @@ -15,6 +16,7 @@ read -p "Confirm host had been setup using the above steps...(yes|no): " confirm read -p "Enter hostname of target: " hostname read -p "Enter IP of target: " ip read -p "Enter config to install on target: " config +read -p "Enter username (if none, use 'root'): " username # Delete key in known hosts if exists sed -i "/$ip/d" ~/.ssh/known_hosts @@ -24,28 +26,29 @@ echo "Copying pubkey to target host" ssh-copy-id -i "$(readlink -f "$HOME/.ssh/id_ed25519.pub")" "root@$ip" # Create temp directory for ssh and luks keys to be copied to host: -temp_ssh=$(mktemp -d) +temp=$(mktemp -d) touch /tmp/luks_secret.key # Function to cleanup temporary directory on exit cleanup() { - rm -rf "$temp_ssh" /tmp/luks_secret.key + rm -rf "$temp" /tmp/luks_secret.key } trap cleanup EXIT -# Create the directory where sshd expects to find the host keys -install -d -m755 "$temp_ssh/persist/etc/ssh" +# Create the directory for target host keys +install -d -m755 "$temp/persist/etc/ssh" -# Create ssh keys if not exists +# Create ssh keys echo "Creating '$hostname' ssh keys" -ssh-keygen -t ed25519 -f "$temp_ssh/persist/etc/ssh/ssh_host_ed25519_key" -C root@"$hostname" -N "" +ssh-keygen -t ed25519 -f "$temp/persist/etc/ssh/ssh_host_ed25519_key" -C root@"$hostname" -N "" -chmod 600 "$temp_ssh/persist/etc/ssh/ssh_host_ed25519_key" -chmod 644 "$temp_ssh/persist/etc/ssh/ssh_host_ed25519_key.pub" +# Extract luks key from secrets +luks_secret=$(nix-shell -p sops --run "SOPS_AGE_KEY_FILE=~/.config/sops/age/keys.txt sops -d --extract '[""\"luks_passphrase""\"][""\"$hostname""\"]' ../nix-secrets/secrets.yaml") +echo "$luks_secret" > /tmp/luks_secret.key # Generate age key from target host and user public ssh key echo "Generating age key from target host and user ssh key" -HOST_AGE_KEY=$(nix-shell -p ssh-to-age --run "cat $temp_ssh/persist/etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age") +HOST_AGE_KEY=$(nix-shell -p ssh-to-age --run "cat $temp/persist/etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age") echo -e "Host age key:\n$HOST_AGE_KEY\n" # Update .sops.yaml with new age key: @@ -60,45 +63,20 @@ sed -i "{ /&hosts:/{n; p; s/\(.*- &\).*/\1$hostname $HOST_AGE_KEY/} }" $SOPS_FILE -# Extract luks key from secrets -luks_secret=$(nix-shell -p sops --run "SOPS_AGE_KEY_FILE=~/.config/sops/age/keys.txt sops -d --extract '[""\"luks_passphrase""\"][""\"$hostname""\"]' ../nix-secrets/secrets.yaml") -echo "$luks_secret" > /tmp/luks_secret.key +# Commit and push changes to sops file +just update-sops-secrets && just update-flake-secrets && just update-flake + +# Copy current nix config over to target +cp -prv . "$temp/persist/etc/nixos" # Install Nixos to target -SHELL=/bin/sh nix run github:nix-community/nixos-anywhere/242444d228636b1f0e89d3681f04a75254c29f66 -- --extra-files "$temp_ssh" --disk-encryption-keys /tmp/luks_secret.key /tmp/luks_secret.key --flake .#"$config" root@"$ip" -i "$HOME/.ssh/id_ed25519" +SHELL=/bin/sh nix run github:nix-community/nixos-anywhere/242444d228636b1f0e89d3681f04a75254c29f66 -- --extra-files "$temp" --disk-encryption-keys /tmp/luks_secret.key /tmp/luks_secret.key --flake .#"$config" root@"$ip" -i "$HOME/.ssh/id_ed25519" [ $? != 0 ] && echo "Error installing Nixos" && exit 1 ## Delete keys from local known_hosts echo "Deleting host from known_hosts" sed -i "/$ip/d" ~/.ssh/known_hosts -# Check host OS has booted (and not booted back into live cd) -while true; -do - read -p "Confirm live CD has been removed... (yes|no): " confirm - [ "$confirm" = "yes" ] && break -done -echo "Waiting for $ip to come back online and port 22 to be open..." -while ! ping -c 1 $ip &> /dev/null || ! nc -zvw3 $ip 22 &> /dev/null -do - echo "$ip is still offline or port 22 is not open. Checking again in 5 seconds..." - sleep 5 -done -echo "$ip is now online and port 22 is open!" - -# Commit and push changes -just update-sops-secrets && just update-flake-secrets && just update-flake -git add . && git commit -m "auto: bootstrapping $hostname" && git push - -# Authorise source public key -echo "Copying pubkey to target host" -ssh-copy-id -i "$(readlink -f "$HOME/.ssh/id_ed25519.pub")" "root@$ip" - -# Copy deploy_key to target for personal repo authorisation -scp -i "$(readlink -f "$HOME/.ssh/id_ed25519")" "$(readlink -f "$HOME/.ssh/deploy_key-ssh-ed25519")" "root@$ip:/persist/etc/ssh/deploy_key-ssh-ed25519" - -ssh -i "$(readlink -f "$HOME/.ssh/id_ed25519")" "root@$ip" "nix-shell -p git --run 'git clone git@git.bitlab21.com:sam/nixos.git /persist/etc/nixos/'" - echo -e "###\nSuccessfully installed Nixos on the target host!\n###" exit 0