Modification : vm_hosted : insserv -> runit .

diff --git a/etc/init.d/tmpfs b/etc/init.d/tmpfs
index a80f6bc..8e46d00 100755 (executable)
--- a/etc/init.d/tmpfs
+++ b/etc/init.d/tmpfs
@@ -59,6 +59,10 @@ do_start() {
                        sudo install -d -m 710 -o postgres -g postgres-data \
                         /run/postgresql
                        
                        sudo install -d -m 710 -o postgres -g postgres-data \
                         /run/postgresql
                        

+                       ! getent passwd postgrey >/dev/null ||
+                       sudo install -d -m 2710 -o postgrey -g postfix \
+                        /run/postgrey
+                       

                        sudo install -d -m 1771 -o root -g root \
                         /run/spawn-fcgi
                 fi
                        sudo install -d -m 1771 -o root -g root \
                         /run/spawn-fcgi
                 fi

diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf
index 6860ff1..220c1f4 100644 (file)
--- a/etc/nginx/nginx.conf
+++ b/etc/nginx/nginx.conf
@@ -1,5 +1,4 @@
 # DOC: http://blog.martinfjordvald.com/2010/07/nginx-primer/
 # DOC: http://blog.martinfjordvald.com/2010/07/nginx-primer/

-daemon on;

 events {
        multi_accept on;
        use epoll;
 events {
        multi_accept on;
        use epoll;

diff --git a/etc/nsd3/nsd.conf b/etc/nsd3/nsd.conf
index ae58d8d..316af64 100644 (file)
--- a/etc/nsd3/nsd.conf
+++ b/etc/nsd3/nsd.conf
@@ -10,7 +10,7 @@ ipv4-edns-size: 4096
 # ipv6-edns-size: 4096
 # logfile: "/var/log/nsd.log"
 # nsid: "aabbccdd"
 # ipv6-edns-size: 4096
 # logfile: "/var/log/nsd.log"
 # nsid: "aabbccdd"

-pidfile: "/run/nsd3.pid"
+# pidfile: "/run/nsd3.pid"

 port: 53
 rrl-ratelimit: 200
 rrl-size: 10000
 port: 53
 rrl-ratelimit: 200
 rrl-size: 10000

diff --git a/etc/php5/fpm/php-fpm.conf b/etc/php5/fpm/php-fpm.conf
index 58b9fe7..f681f14 100644 (file)
--- a/etc/php5/fpm/php-fpm.conf
+++ b/etc/php5/fpm/php-fpm.conf
@@ -1,16 +1,16 @@
 [global]
 [global]

-daemonize = yes
+daemonize = no

 emergency_restart_interval = 1m
 emergency_restart_threshold = 10
 error_log = syslog
 ;events.mechanism = epoll
 log_level = notice
 emergency_restart_interval = 1m
 emergency_restart_threshold = 10
 error_log = syslog
 ;events.mechanism = epoll
 log_level = notice

-pid = /run/php5-fpm.pid
+;pid = /run/php5-fpm.pid

 process.max = 128
 process_control_timeout = 10s
 ;rlimit_core = 0
 rlimit_files = 1024
 syslog.facility = daemon
 process.max = 128
 process_control_timeout = 10s
 ;rlimit_core = 0
 rlimit_files = 1024
 syslog.facility = daemon

-syslog.ident = php-fpm
+syslog.ident = php5-fpm

 
 include=/etc/php5/fpm/pool.d/*.conf
 
 include=/etc/php5/fpm/pool.d/*.conf

diff --git a/etc/php5/fpm/php.ini b/etc/php5/fpm/php.ini
index 00fc40d..77f6a06 100644 (file)
--- a/etc/php5/fpm/php.ini
+++ b/etc/php5/fpm/php.ini
@@ -7,7 +7,7 @@ apc.enabled = 1
 apc.file_update_protection=2
 apc.filters = 
 apc.gc_ttl = 3600
 apc.file_update_protection=2
 apc.filters = 
 apc.gc_ttl = 3600

-apc.include_once_override = 0
+apc.include_once_override = 1

 apc.localcache = 1
 apc.localcache.size = 256
 apc.max_file_size = 1M
 apc.localcache = 1
 apc.localcache.size = 256
 apc.max_file_size = 1M


@@ -75,7 +75,7 @@ mysql.connect_timeout = 60
 mysql.default_host =
 mysql.default_password =
 mysql.default_port =
 mysql.default_host =
 mysql.default_password =
 mysql.default_port =

-mysql.default_socket =
+mysql.default_socket = /run/mysqld/sock/mysql

 mysql.default_user =
 mysql.max_links = -1
 mysql.max_persistent = -1
 mysql.default_user =
 mysql.max_links = -1
 mysql.max_persistent = -1


@@ -127,6 +127,8 @@ engine = On
 error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
 error_log = syslog
 expose_php = On
 error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
 error_log = syslog
 expose_php = On

+extension = apc.so
+;extension_dir = 

 file_uploads = On
 html_errors = On
 ignore_repeated_errors = Off
 file_uploads = On
 html_errors = On
 ignore_repeated_errors = Off

diff --git a/etc/postfix/main.cf b/etc/postfix/main.cf
index 68b34a4..f812f01 100644 (file)
--- a/etc/postfix/main.cf
+++ b/etc/postfix/main.cf
@@ -128,7 +128,7 @@ smtpd_recipient_restrictions =
        permit_sasl_authenticated
        reject_unauth_destination
                # NOTE: ne pas passer par SPFCheck / Postgrey si le mail n'est pas pour nous ou quelqu'un pour lequel on tient lieu de backup_mx
        permit_sasl_authenticated
        reject_unauth_destination
                # NOTE: ne pas passer par SPFCheck / Postgrey si le mail n'est pas pour nous ou quelqu'un pour lequel on tient lieu de backup_mx

-       check_policy_service inet:127.0.0.1:10023
+       check_policy_service unix:/run/postgrey/socket

                # NOTE: Postgrey (greylisting)
        check_policy_service unix:private/spfcheck
        permit_auth_destination
                # NOTE: Postgrey (greylisting)
        check_policy_service unix:private/spfcheck
        permit_auth_destination

diff --git a/etc/sv/dovecot/run b/etc/sv/dovecot/run
new file mode 100755 (executable)
index 0000000..2cc2dd4
--- /dev/null
+++ b/etc/sv/dovecot/run
@@ -0,0 +1,6 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+exec /usr/sbin/dovecot \
+ -c /etc/dovecot/dovecot.conf \
+ -F

diff --git a/etc/sv/nginx/run b/etc/sv/nginx/run
new file mode 100755 (executable)
index 0000000..78e1efb
--- /dev/null
+++ b/etc/sv/nginx/run
@@ -0,0 +1,6 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+exec /usr/sbin/nginx \
+ -c /etc/nginx/nginx.conf \
+ -g 'daemon off;'

diff --git a/etc/sv/nsd3/run b/etc/sv/nsd3/run
new file mode 100755 (executable)
index 0000000..a59c393
--- /dev/null
+++ b/etc/sv/nsd3/run
@@ -0,0 +1,6 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+exec /usr/sbin/nsd \
+ -c /etc/nsd3/nsd.conf \
+ -d

diff --git a/etc/sv/ntp/run b/etc/sv/ntp/run
new file mode 100755 (executable)
index 0000000..f99231e
--- /dev/null
+++ b/etc/sv/ntp/run
@@ -0,0 +1,9 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+exec /usr/sbin/ntpd \
+ -c /etc/ntp.conf \
+ -g \
+ -I 127.0.0.1 \
+ -n \
+ -u ntp:ntp

diff --git a/etc/sv/php5-fpm/run b/etc/sv/php5-fpm/run
new file mode 100755 (executable)
index 0000000..c1c042f
--- /dev/null
+++ b/etc/sv/php5-fpm/run
@@ -0,0 +1,6 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+exec /usr/sbin/php5-fpm \
+ --fpm-config /etc/php5/fpm/php-fpm.conf \
+ --php-ini    /etc/php5/fpm/php.ini

diff --git a/etc/sv/postfix/run b/etc/sv/postfix/run
new file mode 100755 (executable)
index 0000000..3088a77
--- /dev/null
+++ b/etc/sv/postfix/run
@@ -0,0 +1,16 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+
+command_directory=/usr/sbin \
+config_directory=/etc/postfix \
+daemon_directory=/usr/lib/postfix \
+data_directory=/var/lib/postfix \
+mail_owner=postfix \
+queue_directory=/var/spool/postfix \
+setgid_group=postdrop \
+/etc/postfix/postfix-script check
+
+exec /usr/lib/postfix/master \
+ -c /etc/postfix \
+

diff --git a/etc/sv/postgrey/run b/etc/sv/postgrey/run
new file mode 100755 (executable)
index 0000000..fba506a
--- /dev/null
+++ b/etc/sv/postgrey/run
@@ -0,0 +1,12 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+exec /usr/bin/chpst \
+ -u "$sv":"$sv" \
+ /usr/sbin/postgrey \
+ --auto-whitelist-clients=5 \
+ --dbdir=/var/lib/postgrey \
+ --delay=65 \
+ --max-age=35 \
+ --privacy \
+ --unix=/run/postgrey/socket

diff --git a/etc/sv/sshd/run b/etc/sv/sshd/run
new file mode 100755 (executable)
index 0000000..477eebe
--- /dev/null
+++ b/etc/sv/sshd/run
@@ -0,0 +1,4 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+exec /usr/sbin/sshd -D

diff --git a/etc/sv/unbound/run b/etc/sv/unbound/run
new file mode 100755 (executable)
index 0000000..e157a92
--- /dev/null
+++ b/etc/sv/unbound/run
@@ -0,0 +1,6 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+exec /usr/sbin/unbound \
+ -c /etc/unbound/unbound.conf \
+ -d

diff --git a/vm_hosted b/vm_hosted
index 00d2395..b129993 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
 . "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 export TRACE=1

+cd /

 
 rule_help () { # SYNTAX: [--hidden]
        local hidden; [ ${1:+set} ] || hidden=set
 
 rule_help () { # SYNTAX: [--hidden]
        local hidden; [ ${1:+set} ] || hidden=set


@@ -308,6 +309,7 @@ rule_boot_configure () {
  }
 rule_dovecot_configure () {
        rule apt_get_install dovecot-imapd dovecot-managesieved dovecot-sieve
  }
 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 \
        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 \


@@ -385,7 +387,8 @@ rule_dovecot_configure () {
                EOF
        sudo install -m 664 -o root -g root /dev/stdin /etc/postgrey/whitelist_recipients.local <<-EOF
                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
  }
 rule_etckeeper_configure () {
        sudo install -m 644 -o root -g root /dev/stdin /etc/etckeeper/etckeeper.conf <<-EOF


@@ -482,6 +485,13 @@ rule_initramfs_configure () {
         # NOTE: clefs générées par Debian
        sudo update-initramfs -u
  }
         # 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
 rule_gitolite_configure () {
        sudo debconf-set-selections <<-EOF
                gitolite        gitolite/gituser        string  git


@@ -587,7 +597,7 @@ rule_gitolite_configure () {
         do test ! -d /home/git/etc/gitolite/"$d" ||
                rmdir /home/git/etc/gitolite/"$d"
         done
         do test ! -d /home/git/etc/gitolite/"$d" ||
                rmdir /home/git/etc/gitolite/"$d"
         done

-       sudo service tmpfs restart
+       rule tmpfs_configure

  }
 rule_locales_configure () {
        sudo debconf-set-selections <<-EOF
  }
 rule_locales_configure () {
        sudo debconf-set-selections <<-EOF


@@ -705,6 +715,7 @@ rule_mail_configure () {
  }
 rule_mysql_configure () {
        rule apt_get_install mysql-server-5.5
  }
 rule_mysql_configure () {
        rule apt_get_install mysql-server-5.5

+       rule insserv_remove mysql

        rule adduser mysql \
         --disabled-login \
         --disabled-password \
        rule adduser mysql \
         --disabled-login \
         --disabled-password \


@@ -743,38 +754,30 @@ rule_mysql_configure () {
                 --datadir=/home/mysql/data \
                 --no-defaults
         fi
                 --datadir=/home/mysql/data \
                 --no-defaults
         fi

-       sudo service tmpfs restart
-       sudo insserv -r mysql
-       sudo chmod ugo-x /etc/init.d/mysql
-       case $(sudo sv status mysql || true) in
-        (''|run:*|*"s, normally up;"*)
-               rule runit_sv_restart mysql
-               (
-               cd /
-                       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
-               )
-               ;;
-        esac
+       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
  }
 rule_mysql_db_add () { # SYNTAX: $user $db
        sudo -u mysql mysql --batch <<-EOF


@@ -839,7 +842,10 @@ rule_network_configure () {
  }
 rule_nginx_configure () {
        local -; set +f
  }
 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
        sudo rm -rf \
         /etc/nginx/conf.d \
         /etc/nginx/site.d


@@ -908,21 +914,14 @@ rule_nginx_configure () {
                test ! -r "$tool"/etc/nginx/site.d/"$site"/configure.sh ||
                .         "$tool"/etc/nginx/site.d/"$site"/configure.sh
         done
                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 chmod ugo-x /etc/init.d/fcgiwrap
-       #sudo insserv --remove nginx
-       #sudo chmod ugo-x /etc/init.d/nginx

        rule tmpfs_configure
        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
+       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 m4
  }
 rule_nsd3_configure () { # NOTE: DNS autoritaire uniquement
        local -; set +f
        rule apt_get_install nsd m4

+       rule insserv_remove nsd3

        sudo rm -rf \
         /etc/nsd3/zone.d
        sudo install -d -m 750 -o root -g nsd \
        sudo rm -rf \
         /etc/nsd3/zone.d
        sudo install -d -m 750 -o root -g nsd \


@@ -961,13 +960,31 @@ rule_nsd3_configure () { # NOTE: DNS autoritaire uniquement
        sudo install -m 640 -o root -g nsd /dev/stdin \
         /etc/nsd3/nsd.conf
        sudo nsdc rebuild
        sudo install -m 640 -o root -g nsd /dev/stdin \
         /etc/nsd3/nsd.conf
        sudo nsdc rebuild

-       sudo service nsd3 restart
+       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_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 \
        rule adduser php5 \
         --disabled-login \
         --disabled-password \


@@ -991,7 +1008,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 -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
         "$tool"/etc/php5/fpm/php-fpm.conf \
                /etc/php5/fpm/php-fpm.conf
        local conf


@@ -1064,12 +1081,10 @@ rule_php5_fpm_configure () {
                sudo install -m 664 -o php5 -g php5 \
                 "$tool"/etc/php5/fpm/php.ini \
                        /etc/php5/fpm/php.ini
                sudo install -m 664 -o php5 -g php5 \
                 "$tool"/etc/php5/fpm/php.ini \
                        /etc/php5/fpm/php.ini

-               case $(sudo sv status php5-"$pool" || true) in
-                (''|run:*) rule runit_sv_restart php5-"$pool"
-                esac

         done
        rule tmpfs_configure
         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"
  }
 rule_postfix_configure () {
        local hint="run vm_remote postfix_key_send before"


@@ -1079,6 +1094,7 @@ rule_postfix_configure () {
                postfix postfix/main_mailer_type        select  No configuration
                EOF
        rule apt_get_install postfix
                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
        sudo install -m 640 -o root -g root /dev/stdin /etc/postfix/.gitignore <<-EOF
                *.db
                EOF


@@ -1106,10 +1122,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 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
         "$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
         /etc/postfix/aliases <<-EOF
                # See man 5 aliases for format
                abuse: root


@@ -1127,43 +1143,45 @@ rule_postfix_configure () {
                mail_name     = \$myhostname
                mydestination = $vm_hostname \$myhostname \$myorigin
                EOF
                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
         /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
         "$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
         "$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
         "$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
         "$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
         "$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
         "$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
         "$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
         "$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
  }
 rule_postgresql_configure () {
  # DOC: http://wiki.postgresql.org/wiki/Shared_Database_Hosting
        rule apt_get_install postgresql-9.1

+       rule insserv_remove postgresql

        rule adduser postgres \
         --disabled-login \
         --disabled-password \
        rule adduser postgres \
         --disabled-login \
         --disabled-password \


@@ -1196,19 +1214,16 @@ rule_postgresql_configure () {
         /home/postgresql/log \
         /home/postgresql/log/9.1 \
         /home/postgresql/log/9.1/main
         /home/postgresql/log \
         /home/postgresql/log/9.1 \
         /home/postgresql/log/9.1/main

-       sudo service tmpfs restart
+       rule tmpfs_configure

        if sudo test ! -d /home/postgresql/data
         then
                sudo install -d -m 750 -o postgres -g postgres \
                 /home/postgresql/data
        if sudo test ! -d /home/postgresql/data
         then
                sudo install -d -m 750 -o postgres -g postgres \
                 /home/postgresql/data

-               (
-               cd /

                sudo -u postgres pg_createcluster \
                 --datadir=/home/postgresql/data \
                 --logfile=/home/postgresql/log/9.1/main/cluster.log  \
                 --socketdir=/run/postgresql \
                 9.1 main
                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 770 -o postgres -g postgres /dev/stdin \
         /etc/postgresql/9.1/main/pg_hba.conf <<-EOF
         fi
        sudo install -m 770 -o postgres -g postgres /dev/stdin \
         /etc/postgresql/9.1/main/pg_hba.conf <<-EOF


@@ -1218,64 +1233,56 @@ rule_postgresql_configure () {
        sudo install -m 640 -o postgres -g postgres-data \
         "$tool"/etc/postgresql/9.1/main/postgresql.conf \
                /etc/postgresql/9.1/main/postgresql.conf
        sudo install -m 640 -o postgres -g postgres-data \
         "$tool"/etc/postgresql/9.1/main/postgresql.conf \
                /etc/postgresql/9.1/main/postgresql.conf

-       sudo insserv -r postgresql
-       sudo chmod ugo-x /etc/init.d/postgresql
-       case $(sudo sv status postgres || true) in
-        (''|run:*|*"s, normally up;"*)
-               rule runit_sv_restart postgres
-               (
-               cd /
-               while ! sudo -u postgres psql </dev/null
-               do sleep 0.3; 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
-               )
-               ;;
-        esac
+       rule runit_sv_configure postgres
+       rule runit_sv_restart   postgres
+       while ! sudo -u postgres psql </dev/null
+       do sleep 0.3; 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_postgresql_db_add () { # SYNTAX: $db $owner
        local db="$1"
  }
 rule_postgresql_db_add () { # SYNTAX: $db $owner
        local db="$1"


@@ -1344,20 +1351,12 @@ rule_postgresql_db_user_add () { # SYNTAX: $db $user
                GRANT CONNECT,TEMPORARY ON DATABASE $db TO $user;
                EOF
  }
                GRANT CONNECT,TEMPORARY ON DATABASE $db TO $user;
                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/7.0/nightly/deb/ ./
-               EOF
-       sudo install -d -m 1777 -o root -g root \
-        /etc/openerp
-       sudo apt-get update
-       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_postgrey_configure () {
 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
  }
 rule_procmail_configure () {
        rule apt_get_install procmail


@@ -1393,45 +1392,54 @@ rule_runit_configure () { # SYNTAX: $service
                         (yes) shift $#; first=;;
                         esac
                        local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
                         (yes) shift $#; first=;;
                         esac
                        local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')

-                       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"/log
-                               sudo install -m 770 -o root -g root \
-                                "$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_configure "$sv"

                        eval local sv_status=\"\${sv_status_$sv_hash-}\"
                        case $sv_status in
                         ("") true;;
                        eval local sv_status=\"\${sv_status_$sv_hash-}\"
                        case $sv_status in
                         ("") true;;

-                        (fail:*) sleep 1 && sudo sv start "$sv";;
-                        (run:*) rule runit_sv_restart "$sv";;
+                        (run:*|fail:*) rule runit_sv_restart "$sv";;

                         esac
                 done
         done
  }
                         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"/log
+               sudo install -m 770 -o root -g root \
+                "$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_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;;
        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_ssh_configure () {
                 (*) break;;
                 esac
         done
  }
 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
        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


@@ -1497,7 +1505,8 @@ rule_ssh_configure () {
                        StrictHostKeyChecking ask
                        UserKnownHostsFile ~/etc/ssh/known_hosts
                EOF
                        StrictHostKeyChecking ask
                        UserKnownHostsFile ~/etc/ssh/known_hosts
                EOF

-       sudo service ssh restart
+       rule runit_sv_configure sshd
+       rule runit_sv_restart   sshd

  }
 rule_sysctl_configure () {
        local -; set +f
  }
 rule_sysctl_configure () {
        local -; set +f


@@ -1539,10 +1548,11 @@ rule_time_configure () {
                tzdata  tzdata/Zones/Europe     select  Paris
                EOF
        rule dpkg_reconfigure tzdata
                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 m4
  }
 rule_unbound_configure () {
        sudo apt-get install unbound m4

+       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
        sudo install -m 644 -o root -g root /dev/stdin /etc/resolv.conf <<-EOF
                search ${vm_host#*.}
                nameserver 127.0.0.1


@@ -1556,7 +1566,8 @@ rule_unbound_configure () {
         <"$tool"/etc/unbound/unbound.conf |
        sudo install -m 440 -o unbound -g unbound /dev/stdin \
         /etc/unbound/unbound.conf
         <"$tool"/etc/unbound/unbound.conf |
        sudo install -m 440 -o unbound -g unbound /dev/stdin \
         /etc/unbound/unbound.conf

-       sudo service unbound restart
+       rule runit_sv_configure nsd3
+       rule runit_sv_restart   nsd3

  }
 rule_user_add () { # SYNTAX: $user
        local user="$1"; shift
  }
 rule_user_add () { # SYNTAX: $user
        local user="$1"; shift