Switching from DSA to RSA SSH keys

diff --git a/share/hydra/newkeys b/share/hydra/newkeys
index 4970afb7b50361d15494a7a39a1d7eb85c486400..dee5699f9f14e48dbf9325c56c68a9677e28cac3 100755 (executable)
--- 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 9771d7213705ad697b7fafee221a6844dc0ba4a2..61a7b881b62e785f7167ffd0c41a4babd38b1232 100755 (executable)
--- 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