X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=c0e66ab0c025bc13f1bacd8b07c616ef6a14991a;hb=d5c50febfa8b0ee6fada163a1ad3bbbc97a3e9e0;hp=3fa1ea8a9dad7111b816c1d770195c495523bcf8;hpb=4118d096132937d43e05cab63375724eea182a91;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index 3fa1ea8..c0e66ab 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -784,13 +784,33 @@ rule_ssh_configure () {
 		EOF
 	sudo service ssh restart
  }
-rule_user_admin_add () { # SYNTAX: $user
+rule_user_add () { # SYNTAX: $user
+	rule user_configure
 	local user=$1
 	id "$user" >/dev/null ||
 	sudo adduser --disabled-password "$user"
 		# NOTE: le mot-de-passe doit être initialisé par l'utilisateur à l'aide de passwd-init .
 	eval local home\; home="~$user"
+	sudo adduser "$user" users
+	sudo install -m 640 -o root -g root \
+	 "$tool"/var/pub/ssh/"$user".key \
+	 "$home"/etc/ssh/authorized_keys
+	local key; local -; set +f
+	for key in "$tool"/var/pub/openpgp/*.key
+	 do sudo -u "$user" gpg --import "$key"
+	 done
+ }
+rule_user_configure () {
+	true
+ }
+rule_user_admin_add () { # SYNTAX: $user
+	rule user_configure
+	local user=$1
+	id "$user" >/dev/null ||
+	sudo adduser --disabled-password "$user"
+	eval local home\; home="~$user"
 	sudo adduser "$user" sudo
+	sudo adduser "$user" users
 	sudo install -m 640 -o root -g root \
 	 "$tool"/var/pub/ssh/"$user".key \
 	 "$home"/etc/ssh/authorized_keys