Skip to content
Snippets Groups Projects
Commit 54189a85 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Avoid the Vagrant stuff for non-localdev deployment

parent 11cd5a98
No related branches found
No related tags found
3 merge requests!140Merge staging into production,!122Merge develop into staging,!115Continuous deployment for the grid systems
Hide whitespace changes
Inline Side-by-side
nixos/modules/update-deployment
+ 4
− 2
View file @ 54189a85
...@@ -51,8 +51,10 @@ fi ...@@ -51,8 +51,10 @@ fi
git -C "${CHECKOUT}" reset --hard "origin/${BRANCH}" git -C "${CHECKOUT}" reset --hard "origin/${BRANCH}"
# If we happen to be on the local grid then fix the undefined key. # If we happen to be on the local grid then fix the undefined key.
KEY="$(cat /etc/ssh/authorized_keys.d/vagrant)" if [ "${GRIDNAME}" = "local" ]; then
sed -i "s_undefined_\"${KEY}\"_" "${CHECKOUT}"/morph/grid/${GRIDNAME}/public-keys/users.nix 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. # Compute a log message explaining what we're doing.
LOG_MESSAGE="$(date --iso-8601=seconds) $(git -C "${CHECKOUT}" rev-parse HEAD)" LOG_MESSAGE="$(date --iso-8601=seconds) $(git -C "${CHECKOUT}" rev-parse HEAD)"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment