summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-09-08 17:26:01 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-09-08 17:26:01 -0300
commit84676deefdcb300ef4282c23433e0a8f69e992be (patch)
tree017c3d87d14cc5e741b697f52b3accab0400f485
parent269bc45750ef5df18e9ea774397c0d1660660e0a (diff)
downloadhydra-84676deefdcb300ef4282c23433e0a8f69e992be.tar.gz
hydra-84676deefdcb300ef4282c23433e0a8f69e992be.tar.bz2
Do not add keys into puppet tree anymore
-rwxr-xr-xshare/hydra/newkeys7
1 files changed, 4 insertions, 3 deletions
diff --git a/share/hydra/newkeys b/share/hydra/newkeys
index ab6b5ea..c46a809 100755
--- a/share/hydra/newkeys
+++ b/share/hydra/newkeys
@@ -42,7 +42,8 @@ function hydra_genpairs {
BASEDIR="/tmp"
if [ "$1" != "pgp" ]; then
- keyringer $HYDRA genpair ssh nodes/$node/ssh/id_rsa $host $privkey
+ #keyringer $HYDRA genpair ssh nodes/$node/ssh/id_rsa $host $privkey
+ keyringer $HYDRA genpair ssh nodes/$node/ssh/id_rsa $host
fi
if [ "$1" != "ssh" ]; then
@@ -58,10 +59,10 @@ function hydra_genpairs {
hydra_unset_tmpfile $TMPWORK
# Add key into puppet git repository.
- ( cd $PUPPET_KEYS/ssh/$node && git add $(basename $privkey) $(basename $pubkey) )
+ #( cd $PUPPET_KEYS/ssh/$node && git add $(basename $privkey) $(basename $pubkey) )
# Sync pubkeys folder
- ( cd $PUPPET_KEYS/public && find ../ssh/ -maxdepth 2 -name '*.pub' -exec cp {} . \; && git add . )
+ #( cd $PUPPET_KEYS/public && find ../ssh/ -maxdepth 2 -name '*.pub' -exec cp {} . \; && git add . )
}
# Load.