This commit is contained in:
Alex 2022-12-23 00:07:02 +01:00
parent 94a9c8afa8
commit 827987d201
No known key found for this signature in database
GPG key ID: 09EC5284AA804D3C
4 changed files with 16 additions and 6 deletions

View file

@ -11,7 +11,6 @@ if [ "$CLUSTER" = "staging" ]; then
copy nix/nomad-driver-nix2.nix /etc/nixos/nomad-driver-nix2.nix copy nix/nomad-driver-nix2.nix /etc/nixos/nomad-driver-nix2.nix
fi fi
if [ "$CLUSTER" = "prod" ]; then if [ "$CLUSTER" = "prod" ]; then
cmd nixos-rebuild boot cmd nixos-rebuild boot
message "-------------------------------------------------------------------------------------" message "-------------------------------------------------------------------------------------"

View file

@ -1,5 +1,3 @@
#!/usr/bin/env ./sshtool #!/usr/bin/env ./sshtool
write_pass deuxfleurs/cluster/$CLUSTER/passwords /root/deploy_tmp_passwords pipe_pass deuxfleurs/cluster/$CLUSTER/passwords "chpasswd -e"
cmd 'chpasswd -e < /root/deploy_tmp_passwords'
cmd rm /root/deploy_tmp_passwords

17
sshtool
View file

@ -1,10 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
cd $(dirname $0)
CMDFILE="$1" CMDFILE="$1"
shift 1 shift 1
cd $(dirname $CMDFILE)
CMDFILE=./$(basename $CMDFILE)
CLUSTER="$1" CLUSTER="$1"
if [ -z "$CLUSTER" ] || [ ! -d "cluster/$CLUSTER" ]; then if [ -z "$CLUSTER" ] || [ ! -d "cluster/$CLUSTER" ]; then
echo "Usage: $CMDFILE <cluster name>" echo "Usage: $CMDFILE <cluster name>"
@ -36,6 +37,7 @@ EOG
chmod +x /tmp/deploytool_askpass chmod +x /tmp/deploytool_askpass
export SUDO_ASKPASS=/tmp/deploytool_askpass export SUDO_ASKPASS=/tmp/deploytool_askpass
sudo -A sh - <<'EOEVERYTHING' sudo -A sh - <<'EOEVERYTHING'
set -e
EOF EOF
} }
@ -97,6 +99,17 @@ chmod 0600 $TO
EOF EOF
} }
function pipe_pass {
local PASSKEY=$1
local CMD=$2
cat <<EOF
echo '- pipe secret $PASSKEY to command $CMD'
base64 -d <<EOG | $CMD > /dev/null
$(pass $PASSKEY | base64)
EOG
EOF
}
for NIXHOST in $NIXHOSTLIST; do for NIXHOST in $NIXHOSTLIST; do
NIXHOST=${NIXHOST%.*} NIXHOST=${NIXHOST%.*}