dépôts
/
lhc
/
ateliers.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modifications : etc/nsd3/zone.d/heureux-cyclage.org.zone.m4 - Questionnaires migre
[lhc/ateliers.git]
/
vm_hosted
diff --git
a/vm_hosted
b/vm_hosted
index
9e04d2a
..
4ae7223
100755
(executable)
--- 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
}
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
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
-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
}
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"
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"
}
../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
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
}
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
local sv="$1"
while true
do case $(sudo sv start "$sv" | tee /dev/stderr) in
@@
-775,6
+775,9
@@
rule_user_configure () {
sudo install -m 644 -o root -g root \
"$tool"/etc/bash.bashrc \
/etc/bash.bashrc
sudo install -m 644 -o root -g root \
"$tool"/etc/bash.bashrc \
/etc/bash.bashrc
+ sudo install -m 644 -o root -g root \
+ "$tool"/etc/inputrc \
+ /etc/inputrc
sudo install -m 644 -o root -g root \
"$tool"/etc/screenrc \
/etc/screenrc
sudo install -m 644 -o root -g root \
"$tool"/etc/screenrc \
/etc/screenrc
@@
-828,7
+831,7
@@
rule_user_root_configure () {
do sudo gpg --import "$key"
done
}
do sudo gpg --import "$key"
done
}
-rule_www_configure () {
+rule_
_
www_configure () {
rule adduser www \
--disabled-login \
--disabled-password \
rule adduser www \
--disabled-login \
--disabled-password \