X-Git-Url: http://git.cyclocoop.org/%7D%20.%20IkiWiki::cgiurl%20%28%20base%20%20=%3E%20%24params%7Bbase%7D%20%2C%20%28%24date-%3Eday%28%29%20?a=blobdiff_plain;f=vm_hosted;h=5915841401556329ae4e2f22eedf00dbb04ece8f;hb=ef3c0950dae2dfa4d258e98ad7c1dd6b30a47599;hp=a94cafdd1a4f6763d40263b575fc65019a082cd2;hpb=894c145691beeebdb556a5808390d3d1bedbd2d9;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index a94cafd..5915841 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -1233,16 +1233,39 @@ rule_user_add () { # SYNTAX: $user
 	 done
  }
 rule_user_configure () {
-	true
+	sudo install -m 660 -o root -g root /dev/stdin \
+	 /etc/adduser.conf <<-EOF
+		ADD_EXTRA_GROUPS=1
+		DHOME=/home
+		DIR_MODE=0750
+		DSHELL=/bin/bash
+		EXTRA_GROUPS="users"
+		FIRST_GID=1000
+		FIRST_SYSTEM_GID=100
+		FIRST_SYSTEM_UID=100
+		FIRST_UID=1000
+		GROUPHOMES=no
+		LAST_GID=29999
+		LAST_SYSTEM_GID=999
+		LAST_SYSTEM_UID=999
+		LAST_UID=29999
+		LETTERHOMES=no
+		NAME_REGEX="^[a-z][-a-z0-9_.]*\$"
+		QUOTAUSER="" # TODO: init
+		SETGID_HOME=no
+		SKEL=/etc/skel
+		SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)"
+		USERGROUPS=yes
+		USERS_GID=100
+		EOF
  }
 rule_user_admin_add () { # SYNTAX: $user
 	rule user_configure
 	local user=$1
-	id "$user" >/dev/null ||
+	getent passwd "$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