Use keys/ssh instead of modules/site_keys

diff --git a/lib/hydra/config b/lib/hydra/config
index fe7606e49a666b9838eecb4e6d375e53e317982b..d1eb411af01099c8c33474ee0ba4b84ce51bab26 100644 (file)
--- a/lib/hydra/config
+++ b/lib/hydra/config
@@ -50,7 +50,7 @@ function hydra_check_preferences {
 
   # Set basic variables
   PUPPET="$HYDRA_FOLDER/puppet"
-  PUPPET_KEYS="$PUPPET/modules/site_keys/files"
+  PUPPET_KEYS="$PUPPET/keys"
 
   export HYDRA_CONNECT="ssh -T -o ConnectTimeout=15"
 }

diff --git a/share/hydra/newkeys b/share/hydra/newkeys
index 35dce4f366e95a26e666efd30468e8e8aa907328..152416e5b623a65fc3e8e2b6b2a72adebd1e4c64 100755 (executable)
--- a/share/hydra/newkeys
+++ b/share/hydra/newkeys
@@ -21,7 +21,7 @@ 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_rsa"
+    privkey="$PUPPET_KEYS/ssh/$node/"$node"_id_rsa"
     pubkey="$privkey.pub"
     if [ "$1" == "all" ]; then
       hydra_genpairs
@@ -58,7 +58,7 @@ function hydra_genpairs {
   hydra_unset_tmpfile $TMPWORK
 
   # Add key into puppet git repository.
-  ( cd $PUPPET_KEYS && git add $(basename $privkey) $(basename $pubkey) )
+  ( cd $PUPPET_KEYS/ssh/$node && git add $(basename $privkey) $(basename $pubkey) )
 }
 
 # Load.