diff options
Diffstat (limited to 'share/hydra/newkeys')
| -rwxr-xr-x | share/hydra/newkeys | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/share/hydra/newkeys b/share/hydra/newkeys index c46a809..37e76e8 100755 --- a/share/hydra/newkeys +++ b/share/hydra/newkeys @@ -21,8 +21,8 @@ function hydra_newkeys { # GPG keys should be manually imported in the nodes for host in `hydra $HYDRA nodes`; do node="`echo $host | cut -d . -f 1`" - privkey="$PUPPET_KEYS/ssh/$node/"$node"_id_rsa" - pubkey="$privkey.pub" + sshkey="$HYDRA_FOLDER/keyring/keys/nodes/$node/ssh/id_rsa.asc" + gpgkey="$HYDRA_FOLDER/keyring/keys/nodes/$node/gpg/key.asc" if [ "$1" == "all" ]; then hydra_genpairs elif [ "$1" == "all-ssh" ]; then @@ -32,7 +32,7 @@ function hydra_newkeys { elif [ ! -z "$1" ] && [ "$node" == "$1" ]; then hydra_genpairs $2 exit $? - elif [ ! -e "$privkey" ] || [ ! -e "$pubkey" ]; then + elif [ ! -e "$sshkey" ] || [ ! -e "$gpgkey" ]; then hydra_genpairs fi done @@ -42,7 +42,6 @@ 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 fi @@ -57,12 +56,6 @@ function hydra_genpairs { keyringer $HYDRA git push hydra_unset_tmpfile $TMPWORK - - # Add key into puppet git repository. - #( 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 . ) } # Load. |