Ajout : vm_hosted : rule_user_configure .

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index b4a73b5..5915841 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -305,7 +305,7 @@ rule_dovecot_configure () {
        sudo install -m 400 -o root -g root \
             "$tool"/var/pub/x509/$vm_domainname/imap/crt+crl.self-signed.pem \
         /etc/dovecot/$vm_domainname/imap/x509/crt+crl.self-signed.pem
-       sudo install -d -m 770 -o root -g adm \
+       sudo install -d -m 770 -o root -g root \
         /etc/skel/etc/mail \
         /etc/skel/etc/sieve
        sudo install -d -m 1777 -o root -g root \
@@ -610,7 +610,7 @@ rule_gitolite_configure () {
        #sudo sv restart spawn-fcgi.git.80.git.heureux-cyclage.org
        #sudo sv restart git-daemon.git.9418
  }
-rule_locale_configure () {
+rule_locales_configure () {
        sudo debconf-set-selections <<-EOF
                locales locales/default_environment_locale      select  None
                locales locales/locales_to_be_generated multiselect     fr_FR.UTF-8 UTF-8
@@ -1106,12 +1106,12 @@ rule_postgrey_configure () {
  }
 rule_procmail_configure () {
        rule apt_get_install procmail
-       sudo install -d -m 770 -o root -g adm \
+       sudo install -d -m 770 -o root -g root \
         /etc/skel/etc/mail \
         /etc/skel/var/cache/mail \
         /etc/skel/var/log/mail \
         /etc/skel/var/mail
-       sudo install -m 660 -o root -g adm \
+       sudo install -m 660 -o root -g root \
         "$tool"/etc/skel/etc/mail/delivery.procmailrc \
                /etc/skel/etc/mail/delivery.procmailrc
  }
@@ -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
@@ -1326,7 +1349,7 @@ rule_configure () {
        rule apt_configure
        rule git_configure
        rule etckeeper_configure
-       rule locale_configure
+       rule locales_configure
        rule time_configure
        rule network_configure
        rule filesystem_configure