Polissage : vm_hosted : rule_locale{=>s}_configure .

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index c90252c..a94cafd 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -305,7 +305,7 @@ rule_dovecot_configure () {
        sudo install -m 400 -o root -g root \
             "$tool"/var/pub/x509/$vm_domainname/imap/crt+crl.self-signed.pem \
         /etc/dovecot/$vm_domainname/imap/x509/crt+crl.self-signed.pem
-       sudo install -d -m 770 -o root -g adm \
+       sudo install -d -m 770 -o root -g root \
         /etc/skel/etc/mail \
         /etc/skel/etc/sieve
        sudo install -d -m 1777 -o root -g root \
@@ -610,7 +610,7 @@ rule_gitolite_configure () {
        #sudo sv restart spawn-fcgi.git.80.git.heureux-cyclage.org
        #sudo sv restart git-daemon.git.9418
  }
-rule_locale_configure () {
+rule_locales_configure () {
        sudo debconf-set-selections <<-EOF
                locales locales/default_environment_locale      select  None
                locales locales/locales_to_be_generated multiselect     fr_FR.UTF-8 UTF-8
@@ -660,6 +660,10 @@ rule_login_configure () {
                # 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
@@ -1102,15 +1106,43 @@ rule_postgrey_configure () {
  }
 rule_procmail_configure () {
        rule apt_get_install procmail
-       sudo install -d -m 770 -o root -g adm \
+       sudo install -d -m 770 -o root -g root \
         /etc/skel/etc/mail \
         /etc/skel/var/cache/mail \
         /etc/skel/var/log/mail \
         /etc/skel/var/mail
-       sudo install -m 660 -o root -g adm \
+       sudo install -m 660 -o root -g root \
         "$tool"/etc/skel/etc/mail/delivery.procmailrc \
                /etc/skel/etc/mail/delivery.procmailrc
  }
+rule_runit_configure () {
+       rule apt_get_install runit
+       local -; set +f
+       rm -f /etc/service/*
+        # NOTE: runsvdir éteindra les services qui n'apparaîtront plus ici.
+       for sv in "$tool"/etc/sv/*
+        do sv=${sv#"$tool"/etc/sv/}
+               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
+               if test ! -x "$tool"/etc/sv/"$sv"/configure ||
+                       "$tool"/etc/sv/"$sv"/configure
+                then
+                       ln -fns ../sv/"$sv" /etc/service/"$sv"
+                       sv restart "$sv"
+                else
+        done
+ }
 rule_ssh_configure () {
        ssh-keygen -F "$vm_fqdn" -f "$tool"/etc/openssh/known_hosts |
        ( while IFS= read -r line
@@ -1290,22 +1322,11 @@ rule_user_root_configure () {
         do sudo gpg --import "$key"
         done
  }
-rule_xinetd_configure () {
-       rule apt_get_install xinetd
-       local -; set +f
-       for conf in "$tool"/etc/xinetd.d/*
-        do conf=${conf#"$tool"/etc/xinetd.d/}
-               sudo install -m 660 -o root -g root \
-                "$tool"/etc/xinetd.d/"$conf" \
-                       /etc/xinetd.d/"$conf"
-        done
-       sudo service xinetd restart
- }
 rule_configure () {
        rule apt_configure
        rule git_configure
        rule etckeeper_configure
-       rule locale_configure
+       rule locales_configure
        rule time_configure
        rule network_configure
        rule filesystem_configure
@@ -1320,7 +1341,7 @@ rule_configure () {
        rule nginx_configure
        rule php5_fpm_configure
        rule gitolite_configure
-       rule xinetd_configure
+       rule runit_configure
  }
 
 rule_luks_key_change () {