From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 21 Nov 2010 20:12:14 +0000 (-0200)
Subject: Switching from DSA to RSA SSH keys
X-Git-Tag: 0.1~370
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=69d06aaef3dc845f45111356b3845938cd08b9f7;p=hydra.git

Switching from DSA to RSA SSH keys
---

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