Correction : vm_remote : uniformise rule_runit_configure avec vm_hosted .

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index 3ac6ced..ecf17c4 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -8,7 +8,6 @@ tool=${tool%/*}
 . "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 export TRACE=1
-cd /
 
 rule_help () { # SYNTAX: [--hidden]
        local hidden; [ ${1:+set} ] || hidden=set
@@ -249,13 +248,13 @@ rule_apache2_configure () { # XXX: cette règle n'est pas testée/mise-à-jour
        sudo service apache2 restart
  }
 rule_apt_configure () {
-       sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF
+       sudo install -m 664 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF
                deb http://ftp.rezopole.net/debian $vm_lsb_name main
                EOF
-       sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/$vm_lsb_name-backports.list <<-EOF
+       sudo install -m 664 -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/sources.list.d/openerp.list <<-EOF
+       sudo install -m 664 -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 -m 664 -o root -g root /dev/stdin /etc/apt/preferences <<-EOF
@@ -558,8 +557,8 @@ rule_network_configure () {
        sudo install -m 640 -o root -g root /dev/stdin \
         /etc/network/interfaces
  }
-rule_runit_configure () { # SYNTAX: $sv
-       #rule apt_get_install runit
+rule_runit_configure () { # SYNTAX: $sv [...] -- $configure_options
+       rule apt_get_install runit
        if test $# = 0
         then
                set +x
@@ -592,14 +591,14 @@ rule_runit_configure () { # SYNTAX: $sv
                 -false $(printf -- '-or -name %s\n' $services) \
                 -printf '%f\n')
                 do
-                       rule runit_sv_configure "$sv" "$@"
-                       rule runit_sv_start     "$sv"
+                       rule _runit_sv_configure "$sv" "$@"
+                       rule _runit_sv_start     "$sv"
                 done
                #sleep 3
                #sudo find -L /etc/service -type l -delete
         fi
  }
-rule_runit_sv_configure () { # SYNTAX: $sv $configure_options
+rule__runit_sv_configure () { # SYNTAX: $sv $configure_options
        local sv="$1"; shift
        sudo install -d -m 770 -o root -g root \
         /etc/sv/"$sv"
@@ -626,7 +625,7 @@ rule_runit_sv_configure () { # SYNTAX: $sv $configure_options
                ../sv/"$sv" \
         /etc/service/"$sv"
  }
-rule_runit_sv_restart () { # SYNTAX: $sv
+rule__runit_sv_restart () { # SYNTAX: $sv
        local sv="$1"
        while true
         do case $(sudo sv restart "$sv" | tee /dev/stderr) in
@@ -636,7 +635,7 @@ rule_runit_sv_restart () { # SYNTAX: $sv
                 esac
         done
  }
-rule_runit_sv_start () { # SYNTAX: $sv
+rule__runit_sv_start () { # SYNTAX: $sv
        local sv="$1"
        while true
         do case $(sudo sv start "$sv" | tee /dev/stderr) in
@@ -829,7 +828,7 @@ rule_user_root_configure () {
         do sudo gpg --import "$key"
         done
  }
-rule_www_configure () {
+rule__www_configure () {
        rule adduser www \
         --disabled-login \
         --disabled-password \
@@ -886,6 +885,7 @@ case $rule in
  (help);;
  (*)
        assert 'test "$(hostname --fqdn)" = "$vm_fqdn"' vm_fqdn
+       cd /
        ;;
  esac
 rule $rule "$@"