From 54189a856dcec89b52d32f4a03fab012207e348e Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Wed, 7 Jul 2021 09:04:37 -0400 Subject: [PATCH] Avoid the Vagrant stuff for non-localdev deployment --- nixos/modules/update-deployment | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/update-deployment b/nixos/modules/update-deployment index 306bb882..1f0415a7 100755 --- a/nixos/modules/update-deployment +++ b/nixos/modules/update-deployment @@ -51,8 +51,10 @@ fi git -C "${CHECKOUT}" reset --hard "origin/${BRANCH}" # If we happen to be on the local grid then fix the undefined key. -KEY="$(cat /etc/ssh/authorized_keys.d/vagrant)" -sed -i "s_undefined_\"${KEY}\"_" "${CHECKOUT}"/morph/grid/${GRIDNAME}/public-keys/users.nix +if [ "${GRIDNAME}" = "local" ]; then + KEY="$(cat /etc/ssh/authorized_keys.d/vagrant)" + sed -i "s_undefined_\"${KEY}\"_" "${CHECKOUT}"/morph/grid/${GRIDNAME}/public-keys/users.nix +fi # Compute a log message explaining what we're doing. LOG_MESSAGE="$(date --iso-8601=seconds) $(git -C "${CHECKOUT}" rev-parse HEAD)" -- GitLab