Correction : vm_host : rule_git_configure : reset.
[lhc/ateliers.git] / vm_hosted
index 4bfbede..ed42445 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -8,6 +8,7 @@ tool=${tool%/*}
 . "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 export TRACE=1
+cd /
 
 rule_help () { # SYNTAX: [--hidden]
        local hidden; [ ${1:+set} ] || hidden=set
@@ -34,9 +35,7 @@ rule_git_configure () {
        git config --replace branch.master.merge refs/remotes/master
        local tool
        tool=$(cd "$tool"; cd -)
-       sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
-       sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/vm
-       sudo install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
+       install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
                #!/bin/sh -efux
                case \$1 in
                 (refs/remotes/master)
@@ -62,7 +61,7 @@ rule_adduser () {
        sudo adduser "$@" "$user"
  }
 rule_apt_get_install () { # SYNTAX: $package
-       sudo DEBIAN_FRONTEND=noninteractive apt-get install "$@"
+       sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes "$@"
  }
 rule_dpkg_reconfigure () { # SYNTAX: $package
        sudo DEBIAN_FRONTEND=noninteractive dpkg-reconfigure "$@"
@@ -74,7 +73,7 @@ rule__chrooted_configure () { # NOTE: est-ce bien utile à un moment ?
        . /etc/profile
  }
 
-rule_apache2_configure () {
+rule_apache2_configure () { # XXX: cette règle n'est pas testée/mise-à-jour
        local -; set +f
        rule apt_get_install \
         apache2-mpm-itk \
@@ -245,40 +244,27 @@ rule_apache2_configure () {
  }
 rule_apt_configure () {
        sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF
-               deb http://ftp.fr.debian.org/debian $vm_lsb_name main contrib non-free
+               deb http://ftp.rezopole.net/debian $vm_lsb_name main
                EOF
-       sudo install -m 660 -o root -g root /dev/stdin /etc/apt/$vm_lsb_name-backports.list <<-EOF
-               #deb http://backports.debian.org/debian-backports $vm_lsb_name-backports main contrib non-free
+       sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/$vm_lsb_name-backports.list <<-EOF
+               deb http://ftp.rezopole.net/debian $vm_lsb_name-backports main
                EOF
        sudo install -m 660 -o root -g root /dev/stdin /etc/apt/preferences <<-EOF
                Package: *
                Pin: release a=$vm_lsb_name
-               Pin-Priority: 170
+               Pin-Priority: 200
                
                Package: *
                Pin: release a=$vm_lsb_name-backports
-               Pin-Priority: 200
+               Pin-Priority: 170
                EOF
        sudo apt-get update
        rule apt_get_install apticron
-       sudo install -m 644 -o root -g root /dev/stdin /etc/apticron/apticron.conf <<-EOF
-               EMAIL="admin@$vm_domainname"
-               # DIFF_ONLY="1"
-               # LISTCHANGES_PROFILE="apticron"
-               # ALL_FQDNS="1"
-               # SYSTEM="foobar.example.com"
-               # IPADDRESSNUM="1"
-               # IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
-               # NOTIFY_HOLDS="0"
-               # NOTIFY_NEW="0"
-               # NOTIFY_NO_UPDATES="0"
-               # CUSTOM_SUBJECT=""
-               # CUSTOM_NO_UPDATES_SUBJECT=""
-               # CUSTOM_FROM="root@$vm_fqdn"
-               EOF
-       sudo install -m 660 -o root -g root /dev/stdin /etc/apt/apt.conf.d/01proxy-grenode <<-EOF
-               Acquire::http::Proxy "http://outils.grenode.net:3142";
-               EOF
+       m4 \
+        --define=VM_DOMAINNAME=$vm_domainname \
+        <"$tool"/etc/apticron/apticron.conf.m4 |
+       sudo install -m 644 -o root -g root /dev/stdin \
+        /etc/apticron/apticron.conf
  }
 rule_boot_configure () {
        #warn "lors de l'installation Debian, surtout n'installer GRUB sur AUCUN disque proposé !"
@@ -313,6 +299,7 @@ rule_boot_configure () {
  }
 rule_dovecot_configure () {
        rule apt_get_install dovecot-imapd dovecot-managesieved dovecot-sieve
+       rule insserv_remove dovecot
        local hint="run vm_remote dovecot_key_send before"
        assert "sudo test -f /etc/dovecot/\"$vm_domainname\"/imap/x509/key.pem" hint
        sudo install -m 400 -o root -g root \
@@ -324,62 +311,11 @@ rule_dovecot_configure () {
        sudo install -d -m 1777 -o root -g root \
         /var/lib/dovecot-control \
         /var/lib/dovecot-index
-       sudo install -m 664 -o root -g root /dev/stdin /etc/dovecot/local.conf <<-EOF
-               auth_ssl_username_from_cert = yes
-               listen = *
-               log_timestamp = "%Y-%m-%d %H:%M:%S "
-               mail_debug = yes
-               mail_location = maildir:~/var/mail:INDEX=/var/lib/dovecot-index/%u:CONTROL=/var/lib/dovecot-control/%u
-               # NOTE: INDEX et CONTROL sont sur une partition sans quota comme le demande la doc
-               # VOIR: http://wiki2.dovecot.org/Quota/FS
-               mail_plugins = \$mail_plugins quota
-               mail_privileged_group = mail
-               passdb {
-                       args = /home/%u/etc/dovecot/passwd
-                       driver = passwd-file
-                }
-               plugin {
-                       quota = fs:user
-                       recipient_delimiter = +
-                       sieve = ~/etc/mail/filter.sieve
-                       sieve_dir = ~/etc/mail/sieve
-                       sieve_global_dir = /var/lib/dovecot/sieve/global/
-                       sieve_max_script_size = 1M
-                       sieve_quota_max_scripts = 0
-                       sieve_quota_max_storage = 10M
-                       sieve_user_log = ~/var/log/mail/sieve.log
-                }
-               protocol imap {
-                       mail_plugins = \$mail_plugins imap_quota
-                }
-               protocol lda {
-                       auth_socket_path = /var/run/dovecot/auth-master
-                       hostname = $vm_domainname
-                       info_log_path =
-                       log_path =
-                       mail_plugins = \$mail_plugins sieve
-                       postmaster_address = contact+dovecot+lda@$vm_domainname
-                       syslog_facility = mail
-                }
-               protocols = imap sieve
-               service auth {
-                       user = root
-                       unix_listener /var/spool/postfix/private/auth {
-                               mode  = 0660
-                               user  = postfix
-                               group = postfix
-                        }
-                }
-               ssl_ca = </etc/dovecot/$vm_domainname/imap/x509/crt+crl.self-signed.pem
-               ssl_cert = </etc/dovecot/$vm_domainname/imap/x509/crt+crl.self-signed.pem
-               ssl_cipher_list = AES256-SHA
-               ssl_key = </etc/dovecot/$vm_domainname/imap/x509/key.pem
-               ssl_verify_client_cert = yes
-               userdb {
-                       driver = passwd
-                }
-               verbose_ssl = no
-               EOF
+       m4 \
+        --define=VM_DOMAINNAME=$vm_domainname \
+        <"$tool"/etc/dovecot/local.conf.m4 |
+       sudo install -m 644 -o root -g root /dev/stdin \
+        /etc/dovecot/local.conf
        sudo install -m 755 -o root -g root /dev/stdin /usr/local/bin/dovecot-passwd <<-EOF
                #!/bin/sh -efux
                # DESCRIPTION: permet à un-e utilisateurice d'initialiser ellui-même son mot-de-passe dovecot.
@@ -388,9 +324,8 @@ rule_dovecot_configure () {
                \$USER:\$(/usr/bin/doveadm pw -s SHA512-CRYPT):::::::
                _EOF
                EOF
-       sudo install -m 664 -o root -g root /dev/stdin /etc/postgrey/whitelist_recipients.local <<-EOF
-               EOF
-       sudo service dovecot restart
+       rule runit_sv_configure dovecot
+       rule runit_sv_restart   dovecot
  }
 rule_etckeeper_configure () {
        sudo install -m 644 -o root -g root /dev/stdin /etc/etckeeper/etckeeper.conf <<-EOF
@@ -408,24 +343,18 @@ rule_etckeeper_configure () {
        rule apt_get_install etckeeper
  }
 rule_filesystem_configure () {
-       sudo install -m 644 -o root -g root /dev/stdin /etc/fstab <<-EOF
-               # <file system> <mount point> <type> <options> <dump> <pass>
-               LABEL=${vm_lvm_lv}_boot /boot ext2 defaults 0 0
-               proc /proc proc defaults 0 0
-               sysfs /sys sysfs defaults 0 0
-               /dev/mapper/${vm_lvm_lv}_root_deciphered /     ext4 defaults,errors=remount-ro,acl,barrier=1,noatime 0 1
-               /dev/mapper/${vm_lvm_lv}_var_deciphered  /var  ext4 defaults,errors=remount-ro,acl,barrier=1,noatime 0 1
-               /dev/mapper/${vm_lvm_lv}_home_deciphered /home ext4 defaults,errors=remount-ro,acl,barrier=1,noatime,usrquota,grpquota 0 0
-               # NOTE: barrier=1 réduit drastiquement les performances d'écriture, mais garantit la cohérence du système de fichiers.
-               /dev/mapper/${vm_lvm_lv}_swap_deciphered swap swap sw 0 0
-               EOF
-       sudo install -m 644 -o root -g root /dev/stdin /etc/crypttab <<-EOF
-               # <target name> <source device> <key file> <options>
-               ${vm_lvm_lv}_root_deciphered /dev/$vm_lvm_vg/${vm_lvm_lv}_root none                         luks,lvm=$vm_lvm_vg
-               ${vm_lvm_lv}_var_deciphered  /dev/$vm_lvm_vg/${vm_lvm_lv}_var  ${vm_lvm_lv}_root_deciphered luks,lvm=$vm_lvm_vg,keyscript=/lib/cryptsetup/scripts/decrypt_derived
-               ${vm_lvm_lv}_home_deciphered /dev/$vm_lvm_vg/${vm_lvm_lv}_home ${vm_lvm_lv}_root_deciphered luks,lvm=$vm_lvm_vg,keyscript=/lib/cryptsetup/scripts/decrypt_derived
-               ${vm_lvm_lv}_swap_deciphered /dev/$vm_lvm_vg/${vm_lvm_lv}_swap ${vm_lvm_lv}_root_deciphered luks,lvm=$vm_lvm_vg,keyscript=/lib/cryptsetup/scripts/decrypt_derived
-               EOF
+       m4 \
+        --define=VM_LVM_LV=$vm_lvm_lv \
+        --define=VM_LVM_VG=$vm_lvm_vg \
+        <"$tool"/etc/fstab.m4 |
+       sudo install -m 644 -o root -g root /dev/stdin \
+        /etc/fstab
+       m4 \
+        --define=VM_LVM_LV=$vm_lvm_lv \
+        --define=VM_LVM_VG=$vm_lvm_vg \
+        <"$tool"/etc/crypttab.m4 |
+       sudo install -m 644 -o root -g root /dev/stdin \
+        /etc/crypttab
        rule tmpfs_configure
  }
 rule_initramfs_configure () {
@@ -475,10 +404,11 @@ rule_initramfs_configure () {
                        $users
                        EOF
                 do eval local home\; home="~$user"
-                       cat "$home"/etc/ssh/authorized_keys
+                       sudo cat "$home"/etc/ssh/authorized_keys
                 done
         done |
-       sudo install -m 644 -o root -g root /dev/stdin /etc/initramfs-tools/root/.ssh/authorized_keys
+       sudo install -m 644 -o root -g root /dev/stdin \
+        /etc/initramfs-tools/root/.ssh/authorized_keys
        sudo rm -f \
         /etc/initramfs-tools/root/.ssh/id_rsa.dropbear \
         /etc/initramfs-tools/root/.ssh/id_rsa.pub \
@@ -486,6 +416,13 @@ rule_initramfs_configure () {
         # NOTE: clefs générées par Debian
        sudo update-initramfs -u
  }
+rule_insserv_remove () { # SYNTAX: $sv
+       local sv="$1"
+       sudo chmod u+x /etc/init.d/"$sv"
+       sudo insserv --force --remove "$sv"
+       sudo /etc/init.d/"$sv" stop
+       sudo chmod ugo-x /etc/init.d/"$sv"
+ }
 rule_gitolite_configure () {
        sudo debconf-set-selections <<-EOF
                gitolite        gitolite/gituser        string  git
@@ -507,48 +444,29 @@ rule_gitolite_configure () {
         --home /home/git/log \
         --shell /bin/false \
         --system
-       rule adduser git-data\
+       rule adduser git-data \
         --disabled-login \
         --disabled-password \
         --group \
         --home /home/git/pub \
         --shell /bin/false \
         --system
-       rule adduser git-daemon\
-        --disabled-login \
-        --disabled-password \
-        --group \
-        --home /home/git/pub \
-        --shell /bin/false \
-        --system
-       rule adduser log-git-daemon\
-        --disabled-login \
-        --disabled-password \
-        --group \
-        --home /home/git/log/git-daemon \
-        --shell /bin/false \
-        --system
        sudo adduser git        git-data
-       sudo adduser git-daemon git-data
-       sudo adduser log-git    log-git-daemon
-       sudo install -d -m 770 -o git -g git \
+       sudo install -d -m 750 -o git -g git \
         /etc/gitolite \
         /home/git/etc \
         /home/git/etc/ssh
        sudo install -d -m 751 -o git -g git \
         /home/git
-       sudo install -d -m 3771 -o git-data -g git-data \
+       sudo install -d -m 2770 -o git-data -g git-data \
         /home/git/pub
        sudo install -d -m 1771 -o git -g git \
         /home/git/log
        sudo install -d -m 2770 -o git -g log-git \
         /home/git/log/gitolite \
         /home/git/log/gitolite/perf
-       sudo install -d -m 770 -o log-git-daemon -g log-git-daemon \
-        /home/git/log/git-daemon
-       sudo install -d -m 550 -o www-lhc-git -g www-lhc-git \
-        /etc/gitweb \
-        /etc/gitweb/cgi
+       sudo install -d -m 3771 -o git -g git \
+        /home/git/hooks
        sudo ln -fns /etc/gitolite /home/git/etc/gitolite
        sudo ln -fns /etc/gitweb /home/git/etc/gitweb
        sudo ln -fns etc/gitolite/gitolite.rc /home/git/.gitolite.rc
@@ -569,7 +487,7 @@ rule_gitolite_configure () {
                \$GL_CONF = "\$GL_ADMINDIR/conf/gitolite.conf";
                \$GL_CONF_COMPILED = "\$GL_ADMINDIR/conf/gitolite.conf.pm";
                #\$GL_GET_MEMBERSHIPS_PGM = "/usr/local/bin/expand-ldap-user-to-groups"
-               \$GL_GITCONFIG_KEYS = "hooks\\..* repo\\..*";
+               \$GL_GITCONFIG_KEYS = "gitweb\\..* hooks\\..*";
                #\$GL_HOSTNAME = "git.$vm_domainname";
                        # NOTE: read doc/mirroring.mkd COMPLETELY before setting this.
                #\$GL_HTTP_ANON_USER = "mob";
@@ -589,7 +507,7 @@ rule_gitolite_configure () {
                #\$GL_WILDREPOS_DEFPERMS = 'R @all';
                \$GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
                \$HTPASSWD_FILE = "";
-               \$PROJECTS_LIST = \$ENV{HOME} . "/projects.list";
+               \$PROJECTS_LIST = \$ENV{HOME} . "/etc/gitweb/projects.list";
                \$REPO_BASE = "pub";
                \$REPO_UMASK = 0007;
                \$RSYNC_BASE = "";
@@ -598,40 +516,9 @@ rule_gitolite_configure () {
                \$WEB_INTERFACE = "gitweb";
                1;
                EOF
-       sudo install -m 740 -o git -g www-lhc-git /dev/stdin \
-        /home/git/etc/gitweb/gitweb.conf <<-EOF
-               \$commit_oneline_message_width = 70;
-               \$default_projects_order = 'age';
-               \$default_text_plain_charset = 'UTF-8';
-               @diff_opts = ();
-               \$favicon = "img/git-favicon.png";
-               \$git_temp = "/run/shm/tmp/gitweb";
-               \$home_footer = "/etc/gitweb/cgi/home-footer.cgi.inc";
-               \$home_header = "/etc/gitweb/cgi/home-header.cgi.inc";
-               \$home_link = "/";
-               \$home_link_str = 'd&eacute;p&ocirc;ts';
-               \$home_th_age = 'activit&eacute;';
-               \$home_th_descr = 'description';
-               \$home_th_owner = 'contact';
-               \$home_th_project = 'd&eacute;p&ocirc;t';
-               \$javascript = "js/gitweb.js";
-               \$logo = "img/git-logo.png";
-               \$my_uri = "";
-               \$projectroot = "../git";
-               \$projects_list = "/etc/gitolite/projects.list";
-               \$projects_list_description_width = 42;
-               \$projects_list_owner_width = 15;
-               \$search_str = "Filtre&nbsp;:";
-               \$site_footer = "/etc/gitweb/cgi/site-footer.bin";
-               \$site_header = undef;
-               \$site_name = "git.$vm_domainname";
-               \$space_to_nbsp = 0;
-               @stylesheets = ("css/gitweb.css");#
-               \$untabify_tabstop = 2;
-               EOF
        sudo install -m 600 -o git -g git \
         "$tool"/var/pub/ssh/git.key \
-               /home/git/etc/ssh/git.pub
+          /home/git/etc/ssh/git.pub
        sudo -u git \
         GL_RC=/home/git/etc/gitolite/gitolite.rc \
         GIT_AUTHOR_NAME=git \
@@ -641,8 +528,7 @@ rule_gitolite_configure () {
         do test ! -d /home/git/etc/gitolite/"$d" ||
                rmdir /home/git/etc/gitolite/"$d"
         done
-       rule apt_get_install gitweb highlight
-       sudo service tmpfs restart
+       rule tmpfs_configure
  }
 rule_locales_configure () {
        sudo debconf-set-selections <<-EOF
@@ -652,90 +538,12 @@ rule_locales_configure () {
        rule dpkg_reconfigure locales
  }
 rule_login_configure () {
-       sudo install -m 644 -o root -g root /dev/stdin /etc/inittab <<-EOF
-               # /etc/inittab: init(8) configuration.
-               
-               # The default runlevel.
-               id:2:initdefault:
-               
-               # Boot-time system configuration/initialization script.
-               # This is run first except when booting in emergency (-b) mode.
-               si::sysinit:/etc/init.d/rcS
-               
-               # What to do in single-user mode.
-               ~~:S:wait:/sbin/sulogin
-               
-               # /etc/init.d executes the S and K scripts upon change
-               # of runlevel.
-               #
-               # Runlevel 0 is halt.
-               # Runlevel 1 is single-user.
-               # Runlevels 2-5 are multi-user.
-               # Runlevel 6 is reboot.
-               
-               l0:0:wait:/etc/init.d/rc 0
-               l1:1:wait:/etc/init.d/rc 1
-               l2:2:wait:/etc/init.d/rc 2
-               l3:3:wait:/etc/init.d/rc 3
-               l4:4:wait:/etc/init.d/rc 4
-               l5:5:wait:/etc/init.d/rc 5
-               l6:6:wait:/etc/init.d/rc 6
-               # Normally not reached, but fallthrough in case of emergency.
-               z6:6:respawn:/sbin/sulogin
-               
-               # What to do when CTRL-ALT-DEL is pressed.
-               ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-               
-               # What to do when the power fails/returns.
-               pf::powerwait:/etc/init.d/powerfail start
-               pn::powerfailnow:/etc/init.d/powerfail now
-               po::powerokwait:/etc/init.d/powerfail stop
-               
-               # Xen hypervisor console
-               hvc:2345:respawn:/sbin/getty 38400 hvc0
-               #xvc:2345:respawn:/sbin/getty 38400 xvc0
-               
-               #-- runit begin
-               SV:123456:respawn:/usr/sbin/runsvdir-start
-               #-- runit end
-               EOF
-       sudo install -m 644 -o root -g root /dev/stdin /etc/login.defs <<-EOF
-               MAIL_DIR         /var/mail
-               FAILLOG_ENAB     yes
-               LOG_UNKFAIL_ENAB no
-               LOG_OK_LOGINS    no
-               SYSLOG_SU_ENAB   yes
-               SYSLOG_SG_ENAB   yes
-               FTMP_FILE        /var/log/btmp
-               SU_NAME          su
-               HUSHLOGIN_FILE   .hushlogin
-               ENV_SUPATH       PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-               ENV_PATH         PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-                # NOTE: met les sbin/ dans ENV_PATH ;
-                #  - ça n'apporte aucune protection de ne pas les mettre ;
-                #  - ça frustre de ne pas les trouver.
-               TTYGROUP         tty
-               TTYPERM          0600
-               ERASECHAR        0177
-               KILLCHAR         025
-               UMASK            007
-                # NOTE: rwxrwx--- ;
-                #  - donne une même confiance au groupe propriétaire qu'au propriétaire ;
-                #  - facilite l'utilisation des ACL, qui sont dépendantes des droits du groupe propriétaire.
-               PASS_MAX_DAYS    99999
-               PASS_MIN_DAYS    0
-               PASS_WARN_AGE    7
-               UID_MIN           1000
-               UID_MAX          60000
-               GID_MIN           1000
-               GID_MAX          60000
-               LOGIN_RETRIES    3
-               LOGIN_TIMEOUT    60
-               CHFN_RESTRICT    rwh
-               DEFAULT_HOME     yes
-               USERGROUPS_ENAB  yes
-               ENCRYPT_METHOD   SHA512
-               EOF
+       sudo install -m 644 -o root -g root \
+        "$tool"/etc/inittab \
+               /etc/inittab
+       sudo install -m 644 -o root -g root \
+        "$tool"/etc/login.defs \
+               /etc/login.defs
        grep -q '^session optional pam_umask.so\>' /etc/pam.d/common-session ||
        sudo install -m 644 -o root -g root /dev/stdin /etc/pam.d/common-session <<-EOF
                $(cat /etc/pam.d/common-session)
@@ -760,14 +568,85 @@ rule_mail_configure () {
  }
 rule_mysql_configure () {
        rule apt_get_install mysql-server-5.5
-       sudo install -m 644 -o root -g root \
-           "$tool"/etc/mysql/my.cnf \
-           /etc/mysql/my.cnf
-       if test ! -d /home/mysql; then
-           sudo install -d -m 750 -o mysql -g mysql \
-               /home/mysql
-           sudo -u mysql mysql_install_db --no-defaults --datadir=/home/mysql/
-       fi
+       rule insserv_remove mysql
+       rule adduser mysql \
+        --disabled-login \
+        --disabled-password \
+        --group \
+        --home /home/mysql \
+        --shell /bin/false \
+        --system
+       rule adduser mysql-data \
+        --disabled-login \
+        --disabled-password \
+        --group \
+        --home /home/mysql/data \
+        --no-create-home \
+        --shell /bin/false \
+        --system
+       sudo usermod --home /home/mysql mysql
+       sudo adduser mysql mysql-data
+       sudo install -d -m 751 -o mysql -g mysql \
+        /home/mysql
+       sudo rm -rf /etc/mysql
+       sudo install -d -m 750 -o mysql -g mysql \
+        /etc/mysql \
+        /etc/mysql/conf.d \
+        /home/mysql/etc
+       sudo ln -fns \
+                   /etc/mysql \
+        /home/mysql/etc/mysql
+       sudo install -m 644 -o mysql -g mysql \
+        "$tool"/etc/mysql/my.cnf \
+               /etc/mysql/my.cnf
+       if sudo test ! -d /home/mysql/data
+        then
+               sudo install -d -m 750 -o mysql -g mysql-data \
+                /home/mysql/data
+               sudo -u mysql mysql_install_db \
+                --datadir=/home/mysql/data \
+                --no-defaults
+        fi
+       rule tmpfs_configure
+       rule runit_sv_configure mysql
+       rule runit_sv_restart   mysql
+       while ! sudo -u mysql mysql -u mysql </dev/null
+       do sleep 0.3; done
+       # NOTE:
+       # - ajoute l'accès par socket Unix à mysql
+       # - ajoute les droits de super-utilisateur à mysql
+       # - supprime l'accès par mot-de-passe à root
+       # - supprime les bases de données de l'utilisateurice anonyme
+       # - supprime l'utilisateurice anonyme
+       # NOTE: mémo :
+       #   GRANT USAGE ON *.* TO 'root'@'*' IDENTIFIED WITH auth_socket;
+       #   CREATE USER 'root'@'localhost' IDENTIFIED WITH auth_socket;
+       #   UPDATE mysql.user SET Password='' WHERE user='root';
+       #   DELETE FROM mysql.user WHERE user = 'root' AND host NOT IN ('localhost', '127.0.0.1', '::1');
+       sudo mysql -u root --batch --verbose <<-EOF
+               DELETE FROM mysql.user WHERE user = 'root' and plugin = '';
+               GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' IDENTIFIED WITH auth_socket;
+               UPDATE mysql.user SET grant_priv='Y',super_priv='Y' WHERE user='mysql';
+               DELETE FROM mysql.db   WHERE user = '';
+               DELETE FROM mysql.user WHERE user = '';
+               FLUSH PRIVILEGES;
+               EOF
+ }
+rule_mysql_db_add () { # SYNTAX: $user $db
+       sudo -u mysql mysql --batch <<-EOF
+               DROP   DATABASE IF EXISTS $db;
+               CREATE DATABASE $db CHARACTER SET utf8 COLLATE utf8_general_ci;
+               GRANT ALL PRIVILEGES ON $base.* TO '$user'@'localhost' IDENTIFIED WITH auth_socket;
+               FLUSH PRIVILEGES;
+               EOF
+ }
+rule_mysql_user_add () { # SYNTAX: $user
+       sudo mysql -u mysql --batch <<-EOF || true
+               DROP   USER '$user'@'localhost';
+               EOF
+       sudo mysql -u mysql --batch <<-EOF
+               CREATE USER '$user'@'localhost' IDENTIFIED WITH auth_socket;
+               EOF
  }
 rule_network_configure () {
        sudo install -m 644 -o root -g root /dev/stdin /etc/hostname <<-EOF
@@ -778,69 +657,22 @@ rule_network_configure () {
                $(cat /etc/hosts)
                127.0.0.1 $vm_fqdn $vm
                EOF
-       sudo install -m 644 -o root -g root /dev/stdin /etc/network/interfaces <<-EOF
-               auto lo
-               iface lo inet loopback
-               
-               auto eth0=grenode
-               iface grenode inet static
-                   address   $vm_ipv4
-                   gateway   $vm_ipv4 # NOTE: proxy_arp sur la passerelle permet d'utiliser la même adresse
-                   network   $vm_ipv4
-                   broadcast $vm_ipv4
-                   netmask   255.255.255.255
-                   mtu 1300
-                     # NOTE: il y a besoin de ça en l'état actuel du réseau de Grenode
-                     #       car la MTU des tunnels GRE/IPsec entre les routeurs de Grenode l'impose.
-                     #
-                     # root@ateliers:~# ping -M do -c 1 -s \$((1500-20-8-200)) soupirail.grenode.net
-                     # PING soupirail.grenode.net (91.216.110.1) 1272(1300) bytes of data.
-                     # 1280 bytes from soupirail.grenode.net (91.216.110.1): icmp_req=1 ttl=63 time=18.0 ms
-                     #
-                     # --- soupirail.grenode.net ping statistics ---
-                     # 1 packets transmitted, 1 received, 0% packet loss, time 0ms
-                     # rtt min/avg/max/mdev = 18.027/18.027/18.027/0.000 ms
-                     # root@ateliers:~# ping -M do -c 1 -s \$((1500-20-8-200+1)) soupirail.grenode.net
-                     # PING soupirail.grenode.net (91.216.110.1) 1273(1301) bytes of data.
-                     # From estran.grenode.net (91.216.110.6) icmp_seq=1 Frag needed and DF set (mtu = 1300)
-                     #
-                     # --- soupirail.grenode.net ping statistics ---
-                     # 0 packets transmitted, 0 received, +1 errors
-                   post-up   ip address add    $vm_ipv4/32 dev \$IFACE
-                   pre-down  ip address delete $vm_ipv4/32 dev \$IFACE
+       sudo install -m 644 -o root -g root /dev/stdin /etc/resolv.conf <<-EOF
+               search ${vm_host#*.}
+               nameserver ${vm_host_nameserver}
                EOF
- }
-rule_www_configure () {
-       rule adduser www \
-        --disabled-login \
-        --disabled-password \
-        --group \
-        --home /home/www \
-        --shell /bin/false \
-        --system
-       rule adduser log-www \
-        --disabled-login \
-        --disabled-password \
-        --group \
-        --home /home/www/log \
-        --shell /bin/false \
-        --system
-       #sudo adduser www www-data
-       sudo adduser www log-www
-       #sudo adduser log log-www
-       usermod --home /home/www/pub www-data
-       sudo install -d -m 751 -o www -g www \
-        /home/www
-       sudo install -d -m 750 -o www -g www \
-        /home/www/etc
-       sudo install -d -m 1771 -o www-data -g www-data \
-        /home/www/pub
-       sudo install -d -m 1771 -o log-www -g log-www \
-        /home/www/log
+       m4 \
+        --define=VM_IPV4=$vm_ipv4 \
+        <"$tool"/etc/network/interfaces.m4 |
+       sudo install -m 640 -o root -g root /dev/stdin \
+        /etc/network/interfaces
  }
 rule_nginx_configure () {
        local -; set +f
-       rule apt_get_install nginx
+       rule php5_fpm_configure
+       rule apt_get_install nginx spawn-fcgi fcgiwrap
+       rule insserv_remove  nginx
+       rule insserv_remove fcgiwrap
        sudo rm -rf \
         /etc/nginx/conf.d \
         /etc/nginx/site.d
@@ -869,7 +701,7 @@ rule_nginx_configure () {
                 --disabled-login \
                 --disabled-password \
                 --group \
-                --home /home/www-data/"$site" \
+                --home /home/www/pub/"$site" \
                 --shell /bin/false \
                 --system
                rule adduser log-www-"$site" \
@@ -879,7 +711,7 @@ rule_nginx_configure () {
                 --home /home/www/log/"$site"/nginx \
                 --shell /bin/false \
                 --system
-               sudo install -d -m 2770 -o log-www-"$site" -g log-www-"$site" \
+               sudo install -d -m 771 -o log-www -g log-www \
                 /home/www/log/"$site"
                sudo install -d -m 770 -o www -g www \
                 /etc/nginx/site.d/"$site"
@@ -909,24 +741,77 @@ rule_nginx_configure () {
                test ! -r "$tool"/etc/nginx/site.d/"$site"/configure.sh ||
                .         "$tool"/etc/nginx/site.d/"$site"/configure.sh
         done
-       rule apt_get_install spawn-fcgi fcgiwrap
-       sudo insserv --remove fcgiwrap
-       sudo insserv --remove nginx
        rule tmpfs_configure
-       sudo service php5-fpm restart
-               # NOTE: relance les processus du pool
-               #       pour leur donner les droits
-               #       de leurs groupes supplémentaires.
-       sudo service nginx restart
-       #case $(sv status nginx) in
-       # (run:*) sudo sv restart nginx
-       # esac
+       rule runit_sv_configure nginx
+       rule runit_sv_restart   nginx
+ }
+rule_nsd3_configure () { # NOTE: DNS autoritaire uniquement
+       local -; set +f
+       rule apt_get_install nsd
+       rule insserv_remove nsd3
+       sudo rm -rf \
+        /etc/nsd3/zone.d
+       sudo install -d -m 750 -o root -g nsd \
+        /etc/nsd3/zone.d
+       {
+               cat <<-EOF
+                       server:
+                               ip-address: $vm_ipv4
+                               ip4-only: yes
+                       EOF
+               cat "$tool"/etc/nsd3/nsd.conf
+               local conf
+               for conf in "$tool"/etc/nsd3/zone.d/*.conf
+                do conf=${conf#"$tool"/etc/nsd3/zone.d/}
+                       local domain=${conf%.conf}
+                       if test -e "$tool"/etc/nsd3/zone.d/"$domain".zone.m4
+                        then m4 \
+                                --define=ZONE_DOMAIN=$domain \
+                                --define=ZONE_SERIAL=$(cd "$tool" && git log -1 --format="%ct" -- etc/nsd3/zone.d/"$domain".zone.m4) \
+                                --define=VM_IP4=$vm_ipv4 \
+                                       "$tool"/etc/nsd3/zone.d/"$domain".zone.m4
+                        else cat "$tool"/etc/nsd3/zone.d/"$domain".zone
+                        fi |
+                       sudo install -m 440 -o root -g nsd /dev/stdin \
+                        /etc/nsd3/zone.d/"$domain".zone
+                       sudo install -m 440 -o root -g nsd \
+                        "$tool"/etc/nsd3/zone.d/"$conf" \
+                               /etc/nsd3/zone.d/"$conf"
+                       cat <<-EOF
+                               zone:
+                                       name: $domain
+                                       zonefile: /etc/nsd3/zone.d/$domain.zone
+                               EOF
+                done
+       } |
+       sudo install -m 640 -o root -g nsd /dev/stdin \
+        /etc/nsd3/nsd.conf
+       sudo nsdc rebuild
+       rule runit_sv_configure nsd3
+       rule runit_sv_restart   nsd3
+ }
+rule_ntp_configure () {
+       # NOTE: http://my.opera.com/marcomarongiu/blog/2011/01/05/independent-wallclock-in-xen-4
+       rule apt_get_install    ntp
+       rule insserv_remove     ntp
+       rule runit_sv_configure ntp
+       rule runit_sv_restart   ntp
+ }
+rule_openerp_configure () {
+       sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF
+               deb http://nightly.openerp.com/7.0/nightly/deb/ ./
+               EOF
+       sudo install -d -m 1777 -o root -g root \
+        /etc/openerp
+       rule apt_get_install openerp --force-yes
+               # XXX: --force-yes car les paquets de nightly.openerp.com
+               #      ne sont pas signés par OpenPGP..
+       rule insserv_remove  openerp
  }
 rule_php5_fpm_configure () {
        local -; set +f
-       rule apt_get_install \
-        php5-fpm \
-        php-apc
+       rule apt_get_install php5-fpm php-apc
+       rule insserv_remove  php5-fpm
        rule adduser php5 \
         --disabled-login \
         --disabled-password \
@@ -950,7 +835,7 @@ rule_php5_fpm_configure () {
        sudo install -d -m 770 -o php5 -g php5 \
         /etc/php5/fpm/conf.d \
         /etc/php5/fpm/pool.d
-       sudo install -m 770 -o php5 -g php5 \
+       sudo install -m 440 -o php5 -g php5 \
         "$tool"/etc/php5/fpm/php-fpm.conf \
                /etc/php5/fpm/php-fpm.conf
        local conf
@@ -1023,12 +908,10 @@ rule_php5_fpm_configure () {
                sudo install -m 664 -o php5 -g php5 \
                 "$tool"/etc/php5/fpm/php.ini \
                        /etc/php5/fpm/php.ini
-               case $(sv status php5-"$pool") in
-                (run:*) sudo sv restart php5-"$pool"
-                esac
         done
        rule tmpfs_configure
-       sudo service php5-fpm restart
+       rule runit_sv_configure php5-fpm
+       rule runit_sv_restart   php5-fpm
  }
 rule_postfix_configure () {
        local hint="run vm_remote postfix_key_send before"
@@ -1038,6 +921,7 @@ rule_postfix_configure () {
                postfix postfix/main_mailer_type        select  No configuration
                EOF
        rule apt_get_install postfix
+       rule insserv_remove  postfix
        sudo install -m 640 -o root -g root /dev/stdin /etc/postfix/.gitignore <<-EOF
                *.db
                EOF
@@ -1065,10 +949,10 @@ rule_postfix_configure () {
        sudo install -m 400 -o root -g root \
         "$tool"/var/pub/x509/smtpd.$vm_domainname/crt+crl.self-signed.pem \
            /etc/postfix/$vm_domainname/smtpd/x509/crt+crl.self-signed.pem
-       sudo install -m 660 -o root -g root \
+       sudo install -m 640 -o root -g root \
         "$tool"/etc/postfix/$vm_domainname/header_checks \
                /etc/postfix/$vm_domainname/header_checks
-       sudo install -m 664 -o root -g root /dev/stdin \
+       sudo install -m 644 -o root -g root /dev/stdin \
         /etc/postfix/aliases <<-EOF
                # See man 5 aliases for format
                abuse: root
@@ -1086,60 +970,232 @@ rule_postfix_configure () {
                mail_name     = \$myhostname
                mydestination = $vm_hostname \$myhostname \$myorigin
                EOF
-       sudo install -m 664 -o root -g root /dev/stdin \
+       sudo install -m 640 -o root -g root /dev/stdin \
         /etc/postfix/main.cf
-       sudo install -m 664 -o root -g root \
+       sudo install -m 640 -o root -g root \
         "$tool"/etc/postfix/master.cf \
                /etc/postfix/master.cf
-       sudo install -m 660 -o root -g root \
+       sudo install -m 640 -o root -g root \
         "$tool"/etc/postfix/$vm_domainname/smtp/x509/policy \
                /etc/postfix/$vm_domainname/smtp/x509/policy
        sudo postmap hash:/etc/postfix/$vm_domainname/smtp/x509/policy
-       sudo install -m 660 -o root -g root \
+       sudo install -m 640 -o root -g root \
         "$tool"/etc/postfix/$vm_domainname/smtp/header_checks \
                /etc/postfix/$vm_domainname/smtp/header_checks
-       sudo install -m 660 -o root -g root \
+       sudo install -m 640 -o root -g root \
         "$tool"/etc/postfix/$vm_domainname/smtpd/sender_access \
                /etc/postfix/$vm_domainname/smtpd/sender_access
        sudo postmap hash:/etc/postfix/$vm_domainname/smtpd/sender_access
-       sudo install -m 660 -o root -g root \
+       sudo install -m 640 -o root -g root \
         "$tool"/etc/postfix/$vm_domainname/smtpd/client_blacklist \
                /etc/postfix/$vm_domainname/smtpd/client_blacklist
        sudo postmap hash:/etc/postfix/$vm_domainname/smtpd/client_blacklist
-       sudo install -m 660 -o root -g root \
+       sudo install -m 640 -o root -g root \
         "$tool"/etc/postfix/$vm_domainname/smtpd/relay_clientcerts \
                /etc/postfix/$vm_domainname/smtpd/relay_clientcerts
        sudo postmap hash:/etc/postfix/$vm_domainname/smtpd/relay_clientcerts
-       sudo install -m 660 -o root -g root \
+       sudo install -m 640 -o root -g root \
         "$tool"/etc/postfix/$vm_domainname/transport \
                /etc/postfix/$vm_domainname/transport
        sudo postmap hash:/etc/postfix/$vm_domainname/transport
-       sudo install -m 660 -o root -g root \
+       sudo install -m 640 -o root -g root \
         "$tool"/etc/postfix/$vm_domainname/virtual_alias \
                /etc/postfix/$vm_domainname/virtual_alias
        sudo postmap hash:/etc/postfix/$vm_domainname/virtual_alias
-       sudo service postfix restart
+       rule runit_sv_configure postfix
+       rule runit_sv_restart   postfix
  }
 rule_postgresql_configure () {
+ # DOC: http://wiki.postgresql.org/wiki/Shared_Database_Hosting
        rule apt_get_install postgresql-9.1
-       if [ ! -d /var/lib/postgresql/9.1/ ]; then
-           pg_createcluster -u postgres --start 9.1 main
-       fi
-       sudo install -m 660 -o root -g root \
-               "$tool"/etc/postgresql/9.1/main/postgresql.conf \
-               /etc/postgresql/9.1/main/postgresql.conf
-       sudo service postgresql restart
+       rule insserv_remove postgresql
+       rule adduser postgres \
+        --disabled-login \
+        --disabled-password \
+        --group \
+        --home /home/postgresql \
+        --shell /bin/false \
+        --system
+       rule adduser postgres-data \
+        --disabled-login \
+        --disabled-password \
+        --group \
+        --home /home/postgresql/data \
+        --no-create-home \
+        --shell /bin/false \
+        --system
+       sudo usermod --home /home/postgresql postgres
+       sudo adduser postgres postgres-data
+       sudo rm -rf \
+        /etc/postgresql
+       sudo install -d -m 1751 -o postgres -g postgres-data \
+        /home/postgresql \
+        /home/postgresql/etc \
+        /etc/postgresql \
+        /etc/postgresql/9.1 \
+        /etc/postgresql/9.1/main
+       sudo ln -fns \
+                        /etc/postgresql \
+        /home/postgresql/etc/postgresql
+       sudo install -d -m 2770 -o postgres -g log-postgres \
+        /home/postgresql/log \
+        /home/postgresql/log/9.1 \
+        /home/postgresql/log/9.1/main
+       rule tmpfs_configure
+       if sudo test ! -d /home/postgresql/data
+        then
+               sudo install -d -m 750 -o postgres -g postgres \
+                /home/postgresql/data
+               sudo -u postgres pg_createcluster \
+                --datadir=/home/postgresql/data \
+                --logfile=/home/postgresql/log/9.1/main/cluster.log  \
+                --socketdir=/run/postgresql \
+                9.1 main
+        fi
+       
+       sudo install -m 640 -o postgres -g postgres /dev/stdin \
+        /etc/postgresql/9.1/main/pg_ctl.conf <<-EOF
+               pg_ctl_options = ''
+               EOF
+       sudo install -m 640 -o postgres -g postgres /dev/stdin \
+        /etc/postgresql/9.1/main/pg_ident.conf <<-EOF
+               # MAPNAME       SYSTEM-USERNAME         PG-USERNAME
+               EOF
+       sudo install -m 640 -o postgres -g postgres /dev/stdin \
+        /etc/postgresql/9.1/main/start.conf <<-EOF
+               EOF
+       sudo install -m 640 -o postgres -g postgres /dev/stdin \
+        /etc/postgresql/9.1/main/pg_hba.conf <<-EOF
+               local all postgres peer
+               local all all      peer
+               EOF
+       sudo install -m 640 -o postgres -g postgres-data \
+        "$tool"/etc/postgresql/9.1/main/postgresql.conf \
+               /etc/postgresql/9.1/main/postgresql.conf
+       rule runit_sv_configure postgres
+       rule runit_sv_restart   postgres
+       while ! sudo -u postgres psql </dev/null
+       do sleep 1; done
+       # NOTE: supprime l'accès au schéma public depuis public,
+       #       de sorte à ce que les différents utilisateurices
+       #       ne voient pas leurs bases de données entre-elleux ;
+       sudo -u postgres psql template1 -a -f - <<-EOF
+               \set ON_ERROR_STOP on
+               REVOKE ALL ON DATABASE template1 FROM public;
+               REVOKE ALL ON SCHEMA   public    FROM public;
+               GRANT  ALL ON SCHEMA   public    TO   postgres;
+               EOF
+       # NOTE: ajoute le support de PL/PGSQL s'il ne l'est pas déjà.
+       sudo -u postgres psql template1 -a -f - <<-EOF
+               \set ON_ERROR_STOP on
+               CREATE OR REPLACE FUNCTION create_language_plpgsql()
+                       RETURNS BOOLEAN AS \$\$
+                               CREATE LANGUAGE plpgsql;
+                               SELECT TRUE;
+                       \$\$ LANGUAGE SQL;
+               SELECT CASE WHEN NOT (
+                       SELECT  TRUE AS exists
+                       FROM    pg_language
+                       WHERE   lanname = 'plpgsql'
+                       UNION
+                       SELECT  FALSE AS exists
+                       ORDER BY exists DESC
+                       LIMIT 1
+                )
+               THEN
+                       create_language_plpgsql()
+               ELSE
+                       FALSE
+               END AS plpgsql_created;
+               DROP FUNCTION create_language_plpgsql();
+               EOF
+       # NOTE: supprime l'accès à la liste des bases données
+       #       et utilisateurices depuis public.
+       sudo -u postgres psql template1 -a -f - <<-EOF
+               \set ON_ERROR_STOP on
+               REVOKE ALL ON pg_auth_members FROM public;
+               REVOKE ALL ON pg_authid       FROM public;
+               REVOKE ALL ON pg_database     FROM public;
+               REVOKE ALL ON pg_group        FROM public;
+               REVOKE ALL ON pg_roles        FROM public;
+               REVOKE ALL ON pg_settings     FROM public;
+               REVOKE ALL ON pg_tablespace   FROM public;
+               REVOKE ALL ON pg_user         FROM public;
+               EOF
  }
-rule_openerp_configure () {
-       sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF
-               deb http://nightly.openerp.com/trunk/nightly/deb/ ./
+rule_postgresql_db_add () { # SYNTAX: $db $owner
+       local db="$1"
+       local owner="${2:-$db}"
+       sudo -u postgres psql template1 -a -f - <<-EOF
+               \set ON_ERROR_STOP on
+               DO LANGUAGE plpgsql \$\$
+               BEGIN
+                       IF NOT EXISTS (
+                        SELECT *
+                        FROM pg_catalog.pg_user
+                        WHERE usename = '$owner'
+                        LIMIT 1
+                       ) THEN
+                               CREATE ROLE $owner
+                                LOGIN
+                                NOCREATEDB
+                                NOCREATEROLE
+                                NOINHERIT
+                                NOSUPERUSER;
+                       END IF;
+               END;
+               \$\$;
+               EOF
+       case $(sudo -u postgres psql template1 -t -c \
+               "SELECT datname FROM pg_catalog.pg_database WHERE datname = '$db' LIMIT 1") in
+        (" $db") true;;
+        (*)
+               sudo -u postgres psql template1 -a -f - <<-EOF
+                       \set ON_ERROR_STOP on
+                       CREATE DATABASE $db WITH OWNER=$owner;
+                       EOF
+               ;;
+        esac
+       sudo -u postgres psql template1 -a -f - <<-EOF
+               \set ON_ERROR_STOP on
+               REVOKE ALL ON DATABASE $db FROM public;
+               EOF
+       sudo -u postgres psql "$db" -a -f - <<-EOF
+               \set ON_ERROR_STOP on
+               GRANT ALL ON SCHEMA public TO $owner WITH GRANT OPTION;
+               EOF
+ }
+rule_postgresql_db_user_add () { # SYNTAX: $db $user
+       local db="$1" user="$2"
+       sudo -u postgres psql "$db" -a -f - <<-EOF
+               \set ON_ERROR_STOP on
+               DO LANGUAGE plpgsql \$\$
+               BEGIN
+                       IF NOT EXISTS (
+                        SELECT *
+                        FROM pg_catalog.pg_user
+                        WHERE usename = '$user'
+                        LIMIT 1
+                       ) THEN
+                               CREATE ROLE $user
+                                LOGIN
+                                NOCREATEDB
+                                NOCREATEROLE
+                                NOINHERIT
+                                NOSUPERUSER;
+                       END IF;
+               END;
+               \$\$;
+               GRANT USAGE ON SCHEMA public TO $user;
+               GRANT CONNECT,TEMPORARY ON DATABASE $db TO $user;
                EOF
-       sudo apt-get update
-       rule apt_get_install openerp
  }
 rule_postgrey_configure () {
-       rule apt_get_install postgrey
-       sudo service postgrey restart
+       rule apt_get_install    postgrey
+       rule insserv_remove     postgrey
+       rule tmpfs_configure
+       rule runit_sv_configure postgrey
+       rule runit_sv_restart   postgrey
  }
 rule_procmail_configure () {
        rule apt_get_install procmail
@@ -1152,47 +1208,118 @@ rule_procmail_configure () {
         "$tool"/etc/skel/etc/mail/delivery.procmailrc \
                /etc/skel/etc/mail/delivery.procmailrc
  }
-rule_runit_configure () {
+rule_runit_configure () { # SYNTAX: $service
        rule apt_get_install runit
        local -; set +f
        for sv in ${1-/etc/service/*}
         # NOTE: stoppe les services en retenant leur status de départ
-        do sv=$(basename "$sv")
+        do sv=${sv##*/}
                local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
                local sv_status
                IFS= read -r sv_status_$sv_hash <<-EOF
-                       $(sv status "$sv")
+                       $(sudo sv status "$sv" || true)
                        EOF
-               rm -f /etc/service/"$sv"
+               sudo rm -f /etc/service/"$sv"
         done
-       for sv in ${1-"$tool"/etc/sv/*}
+       set -$- ${1-"$tool"/etc/sv/*}
+       while test -n "$*"
         # NOTE: configure et (re-)démarre les services
-        do sv=$(basename "$sv")
-               local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
+        do local first=yes
+               for sv in "$@"
+               do sv=${sv##*/}
+                       case $first in
+                        (yes) shift $#; first=;;
+                        esac
+                       local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
+                       rule runit_sv_configure "$sv"
+                       eval local sv_status=\"\${sv_status_$sv_hash-}\"
+                       case $sv_status in
+                        ("") true;;
+                        (run:*|fail:*) rule runit_sv_restart "$sv";;
+                        esac
+                done
+        done
+ }
+rule_runit_sv_configure () { # SYNTAX: $sv
+       local sv="$1"
+       sudo install -d -m 770 -o root -g root \
+        /etc/sv/"$sv"
+       sudo install -m 770 -o root -g root \
+        "$tool"/etc/sv/"$sv"/run \
+               /etc/sv/"$sv"/run
+       if test -e "$tool"/etc/sv/"$sv"/log/run
+        then
                sudo install -d -m 770 -o root -g root \
-                /etc/sv/"$sv"
+                /etc/sv/"$sv"/log
                sudo install -m 770 -o root -g root \
-                "$tool"/etc/sv/"$sv"/run \
-                       /etc/sv/"$sv"/run
-               if test -e "$tool"/etc/sv/"$sv"/log/run
-                then
-                       sudo install -d -m 770 -o root -g root \
-                        /etc/sv/"$sv"/log
-                       sudo install -m 770 -o root -g root \
-                        "$tool"/etc/sv/"$sv"/log/run \
-                               /etc/sv/"$sv"/log/run
-                fi
-               test ! -x "$tool"/etc/sv/"$sv"/configure ||
-               "$tool"/etc/sv/"$sv"/configure
-               ln -fns ../sv/"$sv" /etc/service/"$sv"
-               eval local sv_status=\"\${sv_status_$sv_hash-}\"
-               case $sv_status in
-                ("") sv start "$sv";;
-                (run:*) sv restart "$sv";;
+                "$tool"/etc/sv/"$sv"/log/run \
+                       /etc/sv/"$sv"/log/run
+        fi
+       local continue=
+       test ! -r "$tool"/etc/sv/"$sv"/configure.sh ||
+       .         "$tool"/etc/sv/"$sv"/configure.sh
+       case $continue in
+        (yes) continue;;
+        esac
+       sudo ln -fns \
+               ../sv/"$sv" \
+        /etc/service/"$sv"
+ }
+rule_runit_sv_restart () { # SYNTAX: $sv
+       local sv="$1"
+       rule runit_sv_configure "$sv"
+       while true
+        do case $(sudo sv restart "$sv") in
+                ("fail: $sv: runsv not running") sleep 1;;
+                ("warning: $sv: unable to open supervise/ok: file does not exists") sleep 1;;
+                (*) break;;
                 esac
         done
  }
+rule_shorewall_configure () {
+       # DOC: http://shorewall.net/Introduction.html
+       local -; set +f
+       rule apt_get_install shorewall
+       sudo install -m 644 -o root -g root /dev/stdin \
+        /etc/default/shorewall <<-EOF
+               INITLOG=/dev/null
+               OPTIONS=""
+               RESTARTOPTIONS=""
+               SAFESTOP=0
+               STARTOPTIONS=""
+               startup=1
+               EOF
+       local conf
+       for conf in "$tool"/etc/shorewall/*
+        do conf=${conf#"$tool"/etc/shorewall/}
+               sudo test ! -f "$tool"/etc/shorewall/"$conf" ||
+               sudo install -m 640 -o root -g root \
+                "$tool"/etc/shorewall/"$conf" \
+                       /etc/shorewall/"$conf"
+        done
+       sudo install -d -m 750 -o root -g root \
+        /etc/shorewall/macro.d
+       for conf in "$tool"/etc/shorewall/macro.d/*
+        do conf=${conf#"$tool"/etc/shorewall/macro.d/}
+               sudo test ! -f "$tool"/etc/shorewall/macro.d/"$conf" ||
+               sudo install -m 640 -o root -g root \
+                "$tool"/etc/shorewall/macro.d/"$conf" \
+                       /etc/shorewall/macro.d/"$conf"
+        done
+       sudo install -d -m 750 -o root -g root \
+        /etc/shorewall/action.d
+       #for conf in "$tool"/etc/shorewall/action.d/*
+       # do conf=${conf#"$tool"/etc/shorewall/action.d/}
+       #       sudo test ! -f "$tool"/etc/shorewall/action.d/"$conf" ||
+       #       sudo install -m 640 -o root -g root \
+       #        "$tool"/etc/shorewall/action.d/"$conf" \
+       #               /etc/shorewall/action.d/"$conf"
+       # done
+       #sudo shorewall safe-restart
+ }
 rule_ssh_configure () {
+       rule apt_get_install openssh-server
+       rule insserv_remove ssh
        ssh-keygen -F "$vm_fqdn" -f "$tool"/etc/openssh/known_hosts |
        ( while IFS= read -r line
         do case $line in (*" RSA") return 0; break;; esac
@@ -1204,45 +1331,16 @@ rule_ssh_configure () {
         /etc/ssh/ssh_host_ecdsa_key \
         /etc/ssh/ssh_host_ecdsa_key.pub
         # NOTE: clefs générées par Debian
-       sudo install -m 644 -o root -g root /dev/stdin  /etc/ssh/sshd_config <<-EOF
-               Port 22
-               ListenAddress $vm_ipv4
-               #ListenAddress ::
-               Protocol 2
-               Compression yes
-               HostKey /etc/ssh/ssh_host_rsa_key
-               UsePrivilegeSeparation yes
-               KeyRegenerationInterval 3600
-               ServerKeyBits 768
-               SyslogFacility AUTH
-               LogLevel INFO
-               LoginGraceTime 120
-               PermitRootLogin yes
-               StrictModes yes
-               RSAAuthentication yes
-               PubkeyAuthentication yes
-               AuthorizedKeysFile %h/etc/ssh/authorized_keys
-               IgnoreRhosts yes
-               RhostsRSAAuthentication no
-               HostbasedAuthentication no
-               IgnoreUserKnownHosts no
-               PermitEmptyPasswords no
-               ChallengeResponseAuthentication no
-               PasswordAuthentication no
-               KerberosAuthentication no
-               GSSAPIAuthentication no
-               X11Forwarding no
-               X11DisplayOffset 10
-               PrintMotd no
-               DebianBanner no
-               PrintLastLog yes
-               TCPKeepAlive yes
-               ClientAliveInterval 0
-               AcceptEnv LANG LC_*
-               Subsystem sftp /usr/lib/openssh/sftp-server
-               UsePAM yes
-               EOF
-       sudo service ssh restart
+       m4 \
+        --define=VM_IPV4=$vm_ipv4 \
+        <"$tool"/etc/ssh/sshd_config.m4 |
+       sudo install -m 640 -o root -g root /dev/stdin \
+        /etc/ssh/sshd_config
+       sudo install -m 644 -o root -g root \
+        "$tool"/etc/ssh/ssh_config \
+               /etc/ssh/ssh_config
+       rule runit_sv_configure sshd
+       rule runit_sv_restart   sshd
  }
 rule_sysctl_configure () {
        local -; set +f
@@ -1284,16 +1382,34 @@ rule_time_configure () {
                tzdata  tzdata/Zones/Europe     select  Paris
                EOF
        rule dpkg_reconfigure tzdata
-       rule apt_get_install ntp
+       rule ntp_configure
+ }
+rule_unbound_configure () {
+       sudo apt-get install unbound
+       rule insserv_remove unbound
+       sudo install -m 644 -o root -g root /dev/stdin /etc/resolv.conf <<-EOF
+               search ${vm_host#*.}
+               nameserver 127.0.0.1
+               #nameserver ${vm_host_nameserver}
+               EOF
+       sudo install -m 440 -o unbound -g unbound \
+        "$tool"/etc/unbound/named.cache \
+        /etc/unbound/named.cache
+       m4 \
+        --define=OUTGOING_INTERFACE=$vm_ipv4 \
+        <"$tool"/etc/unbound/unbound.conf |
+       sudo install -m 440 -o unbound -g unbound /dev/stdin \
+        /etc/unbound/unbound.conf
+       rule runit_sv_configure unbound
+       rule runit_sv_restart   unbound
  }
 rule_user_add () { # SYNTAX: $user
-       rule user_configure
-       local user=$1
-       rule adduser "$user" --disabled-password
+       local user="$1"; shift
+       rule adduser "$user" --disabled-password "$@"
                # 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 \
+       sudo install -m 640 -o "$user" -g "$user" \
         "$tool"/var/pub/ssh/"$user".key \
         "$home"/etc/ssh/authorized_keys
        local key; local -; set +f
@@ -1302,31 +1418,10 @@ rule_user_add () { # SYNTAX: $user
         done
  }
 rule_user_configure () {
-       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 apt_get_install bash-completion
+       sudo install -m 660 -o root -g root \
+        "$tool"/etc/adduser.conf \
+               /etc/adduser.conf
        sudo install -d -m 750 -o root -g root \
         /etc/skel \
         /etc/skel/etc \
@@ -1346,7 +1441,7 @@ rule_user_configure () {
                    ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac
                EOF
        sudo install -m 640 -o root -g root /dev/stdin /etc/sudoers.d/etckeeper-unclean <<-EOF
-               %sudo ALL=(ALL) NOPASSWD: /usr/sbin/etckeeper unclean
+               %sudo ALL=(ALL) NOPASSWD: /usr/bin/etckeeper unclean
                EOF
        sudo install -m 640 -o root -g root /dev/stdin /etc/sudoers.d/env_keep <<-EOF
                Defaults env_keep = " \\
@@ -1369,6 +1464,12 @@ rule_user_configure () {
        sudo install -m 644 -o root -g root \
         "$tool"/etc/screenrc \
                /etc/screenrc
+       local sh; local -; set +f
+       for sh in "$tool"/etc/user.d/*/configure.sh
+        do sh=${sh#"$tool"/etc/user.d/}
+               local user="${sh%/configure.sh}"
+               . "$tool"/etc/user.d/"$sh"
+        done
  }
 rule_user_admin_add () { # SYNTAX: $user
        rule user_configure
@@ -1402,7 +1503,7 @@ rule_user_root_configure () {
                        $users
                        EOF
                 do eval local home\; home="~$user"
-                       cat "$home"/etc/ssh/authorized_keys
+                       sudo cat "$home"/etc/ssh/authorized_keys
                 done
         done |
        sudo install -m 640 -o root -g root /dev/stdin /root/etc/ssh/authorized_keys
@@ -1411,6 +1512,34 @@ rule_user_root_configure () {
         do sudo gpg --import "$key"
         done
  }
+rule_www_configure () {
+       rule adduser www \
+        --disabled-login \
+        --disabled-password \
+        --group \
+        --home /home/www \
+        --shell /bin/false \
+        --system
+       rule adduser log-www \
+        --disabled-login \
+        --disabled-password \
+        --group \
+        --home /home/www/log \
+        --shell /bin/false \
+        --system
+       #sudo adduser www www-data
+       sudo adduser www log-www
+       #sudo adduser log log-www
+       usermod --home /home/www/pub www-data
+       sudo install -d -m 751 -o www -g www \
+        /home/www
+       sudo install -d -m 750 -o www -g www \
+        /home/www/etc
+       sudo install -d -m 1771 -o www-data -g www-data \
+        /home/www/pub
+       sudo install -d -m 1771 -o log-www -g log-www \
+        /home/www/log
+ }
 rule_configure () {
        rule apt_configure
        rule git_configure
@@ -1426,11 +1555,15 @@ rule_configure () {
        rule sysctl_configure
        rule user_configure
        rule mail_configure
+       rule gitolite_configure
        rule www_configure
-       rule php5_fpm_configure
        rule nginx_configure
        #rule apache2_configure
-       rule gitolite_configure
+       rule nsd3_configure
+       rule unbound_configure
+       rule postgresql_configure
+       rule mysql_configure
+       rule shorewall_configure
        rule runit_configure
  }