From: Julien Moutinho <julm+burette@autogeree.net>
Date: Tue, 19 Mar 2013 12:42:52 +0000 (+0100)
Subject: Correction : vm_hosted : rule_user_configure : doublon .
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=09436582477e790bb70a0fc2904595b0530fe0f1

Correction : vm_hosted : rule_user_configure : doublon .
---

diff --git a/vm_hosted b/vm_hosted
index b23221b..8fc2641 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -1259,28 +1259,6 @@ rule_user_configure () {
 		USERGROUPS=yes
 		USERS_GID=100
 		EOF
- }
-rule_user_admin_add () { # SYNTAX: $user
-	rule user_configure
-	local user=$1
-	getent passwd "$user" >/dev/null ||
-	sudo adduser --disabled-password "$user"
-	eval local home\; home="~$user"
-	sudo adduser "$user" sudo
-	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_admin_configure
- }
-rule_user_admin_configure () {
-	rule initramfs_configure
-	rule user_root_configure
- }
-rule_user_configure () {
 	sudo install -d -m 750 -o root -g root \
 	 /etc/skel \
 	 /etc/skel/etc \
@@ -1324,6 +1302,26 @@ rule_user_configure () {
 	 "$tool"/etc/screenrc \
 	        /etc/screenrc
  }
+rule_user_admin_add () { # SYNTAX: $user
+	rule user_configure
+	local user=$1
+	getent passwd "$user" >/dev/null ||
+	sudo adduser --disabled-password "$user"
+	eval local home\; home="~$user"
+	sudo adduser "$user" sudo
+	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_admin_configure
+ }
+rule_user_admin_configure () {
+	rule initramfs_configure
+	rule user_root_configure
+ }
 rule_user_root_configure () {
 	sudo install -d -m 750 -o root -g root \
 	 /root/etc \