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
Correction : vm_hosted : permissions pour une exécution non-root.
[lhc/ateliers.git]
/
vm_hosted
diff --git
a/vm_hosted
b/vm_hosted
index
9ebfa13
..
9a0e5a4
100755
(executable)
--- a/
vm_hosted
+++ b/
vm_hosted
@@
-34,7
+34,7
@@
rule_git_configure () {
git config --replace branch.master.merge refs/remotes/master
local tool
tool=$(cd "$tool"; cd -)
git config --replace branch.master.merge refs/remotes/master
local tool
tool=$(cd "$tool"; cd -)
-
sudo
install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
+ install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
#!/bin/sh -efux
case \$1 in
(refs/remotes/master)
#!/bin/sh -efux
case \$1 in
(refs/remotes/master)
@@
-470,10
+470,11
@@
rule_initramfs_configure () {
$users
EOF
do eval local home\; home="~$user"
$users
EOF
do eval local home\; home="~$user"
- cat "$home"/etc/ssh/authorized_keys
+
sudo
cat "$home"/etc/ssh/authorized_keys
done
done |
done
done |
- sudo install -m 644 -o root -g root /dev/stdin /etc/initramfs-tools/root/.ssh/authorized_keys
+ sudo install -m 644 -o root -g root /dev/stdin \
+ /etc/initramfs-tools/root/.ssh/authorized_keys
sudo rm -f \
/etc/initramfs-tools/root/.ssh/id_rsa.dropbear \
/etc/initramfs-tools/root/.ssh/id_rsa.pub \
sudo rm -f \
/etc/initramfs-tools/root/.ssh/id_rsa.dropbear \
/etc/initramfs-tools/root/.ssh/id_rsa.pub \
@@
-565,7
+566,7
@@
rule_gitolite_configure () {
#\$GL_WILDREPOS_DEFPERMS = 'R @all';
\$GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
\$HTPASSWD_FILE = "";
#\$GL_WILDREPOS_DEFPERMS = 'R @all';
\$GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
\$HTPASSWD_FILE = "";
- \$PROJECTS_LIST = \$ENV{HOME} . "/projects.list";
+ \$PROJECTS_LIST = \$ENV{HOME} . "/
etc/gitweb/
projects.list";
\$REPO_BASE = "pub";
\$REPO_UMASK = 0007;
\$RSYNC_BASE = "";
\$REPO_BASE = "pub";
\$REPO_UMASK = 0007;
\$RSYNC_BASE = "";
@@
-1129,7
+1130,7
@@
rule_runit_configure () {
IFS= read -r sv_status_$sv_hash <<-EOF
$(sudo sv status "$sv")
EOF
IFS= read -r sv_status_$sv_hash <<-EOF
$(sudo sv status "$sv")
EOF
- rm -f /etc/service/"$sv"
+
sudo
rm -f /etc/service/"$sv"
done
for sv in ${1-"$tool"/etc/sv/*}
# NOTE: configure et (re-)démarre les services
done
for sv in ${1-"$tool"/etc/sv/*}
# NOTE: configure et (re-)démarre les services
@@
-1150,7
+1151,7
@@
rule_runit_configure () {
fi
test ! -r "$tool"/etc/sv/"$sv"/configure.sh ||
. "$tool"/etc/sv/"$sv"/configure.sh
fi
test ! -r "$tool"/etc/sv/"$sv"/configure.sh ||
. "$tool"/etc/sv/"$sv"/configure.sh
- ln -fns ../sv/"$sv" /etc/service/"$sv"
+
sudo
ln -fns ../sv/"$sv" /etc/service/"$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;;
@@
-1284,6
+1285,7
@@
rule_user_add () { # SYNTAX: $user
done
}
rule_user_configure () {
done
}
rule_user_configure () {
+ rule apt_get_install bash-completion
sudo install -m 660 -o root -g root /dev/stdin \
/etc/adduser.conf <<-EOF
ADD_EXTRA_GROUPS=1
sudo install -m 660 -o root -g root /dev/stdin \
/etc/adduser.conf <<-EOF
ADD_EXTRA_GROUPS=1
@@
-1384,7
+1386,7
@@
rule_user_root_configure () {
$users
EOF
do eval local home\; home="~$user"
$users
EOF
do eval local home\; home="~$user"
- cat "$home"/etc/ssh/authorized_keys
+
sudo
cat "$home"/etc/ssh/authorized_keys
done
done |
sudo install -m 640 -o root -g root /dev/stdin /root/etc/ssh/authorized_keys
done
done |
sudo install -m 640 -o root -g root /dev/stdin /root/etc/ssh/authorized_keys