cluster/staging/node/caribou.nix

@@ -9,7 +9,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   deuxfleurs.hostName = "caribou";
-  deuxfleurs.staticIPv6.address = "2a01:e0a:2c:540::23";
+  deuxfleurs.staticIPv6.address = "2001:910:1204:1::23";
   deuxfleurs.isRaftServer = true;
 
   system.stateVersion = "21.05";

sshtool

@@ -26,7 +26,7 @@ else
 fi
 
 if [ -z "$ROOT_PASS" ]; then
-	read -r -s -p "Enter remote sudo password: " ROOT_PASS
+	read -s -p "Enter remote sudo password: " ROOT_PASS
 	echo
 fi
 
@@ -37,11 +37,11 @@ function header {
 	cat <<EOF
 cat > /tmp/deploytool_askpass_$RANDNAME <<EOG
 #!/usr/bin/env sh
-echo "\\\$DEPLOYTOOL_ROOT_PASSWORD" | base64 -d
+echo "\\\$DEPLOYTOOL_ROOT_PASSWORD"
 EOG
 chmod +x /tmp/deploytool_askpass_$RANDNAME
 export SUDO_ASKPASS=/tmp/deploytool_askpass_$RANDNAME
-export DEPLOYTOOL_ROOT_PASSWORD=$(echo $ROOT_PASS | base64)
+export DEPLOYTOOL_ROOT_PASSWORD="$ROOT_PASS"
 sudo -A sh - <<'EOEVERYTHING'
 set -e
 EOF

tlsproxy

@@ -7,7 +7,7 @@ set -xe
 cd $(dirname $0)
 
 CLUSTER="$1"
-if [ ! -d "cluster/$CLUSTER" ] || [ -z "$CLUSTER" ]; then
+if [ ! -d "cluster/$CLUSTER" ]; then
 	echo "Usage: $0 <cluster name>"
 	echo "The cluster name must be the name of a subdirectory of cluster/"
 	exit 1