From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Tue, 19 Feb 2013 14:53:50 +0000 (+0100)
Subject: Merge branch 'master' of burette.heureux-cyclage.org:ateliers
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=b7d2dd6974bd1a92bcebf30779c6467111d01429;hp=6d5e5063151dc7660b13c5b672881a7b2353bc57

Merge branch 'master' of burette.heureux-cyclage.org:ateliers
---

diff --git a/vm_hosted b/vm_hosted
index a630d12..bd4d064 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -428,8 +428,8 @@ rule_user_admin_add () { # SYNTAX: $user
 	 <"$tool"/var/pub/ssh/"$user".key
 	rule__initramfs_init
 	rule__user_root_init
-	sudo gpg --import "$tool"/var/pub/opengpg/"$user".key
-	    # TODO: importer toutes les clefs des utilisateurices
+	sudo -u "$user" find "$tool"/var/pub/openpgp \
+	 -type f -name '*.key' -exec gpg --import {} \;
  }
 rule_user_mail_format () {
 	mk_dir mod=770 own=root:adm /etc/skel/etc/procmail