diff options
| -rwxr-xr-x | share/hydra/newkeys | 4 | ||||
| -rwxr-xr-x | share/hydractl/backports | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/share/hydra/newkeys b/share/hydra/newkeys index 4970afb..dee5699 100755 --- a/share/hydra/newkeys +++ b/share/hydra/newkeys @@ -8,10 +8,10 @@ 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/"$node"_id_dsa" + privkey="$PUPPET_KEYS/"$node"_id_rsa" pubkey="$privkey.pub" if [ ! -e "$privkey" ] || [ ! -e "$pubkey" ]; then - keyringer $HYDRA genpair ssh $node/ssh/id_dsa $host $privkey + keyringer $HYDRA genpair ssh $node/ssh/id_rsa $host $privkey keyringer $HYDRA genpair gpg $node/gpg/key $host # Add key into puppet git repository. diff --git a/share/hydractl/backports b/share/hydractl/backports index 9771d72..61a7b88 100755 --- a/share/hydractl/backports +++ b/share/hydractl/backports @@ -7,5 +7,4 @@ if ! grep -q -e "^deb http://backports.debian.org/debian"; then echo "deb http://backports.debian.org/debian-backports lenny-backports main contrib non-free" >> /etc/apt/sources.list apt-get update ; apt-get install debian-backports-keyring ; apt-get update - apt-get -t lenny-backports install puppet puppetmaster fi |