diff --git a/scripts/remote-install-encrypt.sh b/scripts/remote-install-encrypt.sh index 2783fcc..07331a8 100755 --- a/scripts/remote-install-encrypt.sh +++ b/scripts/remote-install-encrypt.sh @@ -1,5 +1,4 @@ set -o errexit -set -o nounset set -o pipefail if [ $# -lt 2 ]; then @@ -9,6 +8,21 @@ if [ $# -lt 2 ]; then exit 1 fi +if [ ! -e flake.nix ] + then + echo "flake.nix not found. Searching down." + while [ ! -e flake.nix ] + do + if [ $PWD = "/" ] + then + echo "Found root. Aborting." + exit 1 + else + cd .. + fi + done +fi + hostname=$1 ipaddress=$2 diff --git a/scripts/unlock-boot.sh b/scripts/unlock-boot.sh index e519bc3..2c5cea3 100644 --- a/scripts/unlock-boot.sh +++ b/scripts/unlock-boot.sh @@ -4,19 +4,33 @@ set -o pipefail sshoptions="-o StrictHostKeyChecking=no -o ServerAliveInterval=1 -o ServerAliveCountMax=1 -p 222 -T" HOSTNAME=$1 -echo -diskkey=$(sops -d machines/$HOSTNAME/disk.key) +if [ ! -e flake.nix ] + then + echo "flake.nix not found. Searching down." + while [ ! -e flake.nix ] + do + if [ $PWD = "/" ] + then + echo "Found root. Aborting." + exit 1 + else + cd .. + fi + done +fi +echo if [ $# = 1 ] then + diskkey=$(sops -d machines/$HOSTNAME/disk.key) echo "$diskkey" | ssh $sshoptions root@$HOSTNAME-initrd "systemd-tty-ask-password-agent" #storage echo "$diskkey" | ssh $sshoptions root@$HOSTNAME-initrd "systemd-tty-ask-password-agent" #root elif [ $# = 2 ] then + diskkey=$(sops -d machines/$HOSTNAME/disk.key) IP=$2 - echo "$diskkey" | ssh $sshoptions root@$IP "systemd-tty-ask-password-agent" #storage echo "$diskkey" | ssh $sshoptions root@$IP "systemd-tty-ask-password-agent" #root