X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_hosted;h=ecf17c4068dd4aacc47febcc818ca6de17bd2f76;hp=9e04d2a33bf728fe0f65fbecdc1bb4207b2eb541;hb=eefc410c23df14d9e47bfc1eedcfb500d557c5a8;hpb=af4a5efcb6025d664fb179a8533efa0e2df08265 diff --git a/vm_hosted b/vm_hosted index 9e04d2a..ecf17c4 100755 --- a/vm_hosted +++ b/vm_hosted @@ -557,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 @@ -591,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" @@ -625,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 @@ -635,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 @@ -828,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 \