X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_hosted;h=11dd8bb0a40efccc07d852b0479a6c25a4bdf4d6;hp=bd3d1cc7a415a9f435c3696fdf0f0435c5d7b956;hb=bac5cba029aebec55df758a3c18e8edcf684af1f;hpb=36f68a87aac099e21c72cbf1444ceaf75333e47c

diff --git a/vm_hosted b/vm_hosted
index bd3d1cc..11dd8bb 100755
--- 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 -)
-	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)
@@ -243,23 +243,20 @@ rule_apache2_configure () { # XXX: cette règle n'est pas testée/mise-à-jour
  }
 rule_apt_configure () {
 	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF
-		deb http://ftp.fr.debian.org/debian $vm_lsb_name main contrib non-free
+		deb http://ftp.rezopole.net/debian $vm_lsb_name main
 		EOF
-	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/$vm_lsb_name-backports.list <<-EOF
-		#deb http://backports.debian.org/debian-backports $vm_lsb_name-backports main contrib non-free
+	sudo install -m 660 -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/preferences <<-EOF
 		Package: *
 		Pin: release a=$vm_lsb_name
-		Pin-Priority: 170
+		Pin-Priority: 200
 		
 		Package: *
 		Pin: release a=$vm_lsb_name-backports
-		Pin-Priority: 200
+		Pin-Priority: 170
 		EOF
-	#sudo install -m 660 -o root -g root /dev/stdin /etc/apt/apt.conf.d/02proxy-grenode <<-EOF
-	#	Acquire::http::Proxy "http://outils.grenode.net:3142";
-	#	EOF
 	sudo apt-get update
 	rule apt_get_install apticron
 	sudo install -m 644 -o root -g root /dev/stdin /etc/apticron/apticron.conf <<-EOF
@@ -473,10 +470,11 @@ rule_initramfs_configure () {
 			$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 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 \
@@ -548,7 +546,7 @@ rule_gitolite_configure () {
 		\$GL_CONF = "\$GL_ADMINDIR/conf/gitolite.conf";
 		\$GL_CONF_COMPILED = "\$GL_ADMINDIR/conf/gitolite.conf.pm";
 		#\$GL_GET_MEMBERSHIPS_PGM = "/usr/local/bin/expand-ldap-user-to-groups"
-		\$GL_GITCONFIG_KEYS = "hooks\\..* repo\\..*";
+		\$GL_GITCONFIG_KEYS = "gitweb\\..* hooks\\..*";
 		#\$GL_HOSTNAME = "git.$vm_domainname";
 			# NOTE: read doc/mirroring.mkd COMPLETELY before setting this.
 		#\$GL_HTTP_ANON_USER = "mob";
@@ -568,7 +566,7 @@ rule_gitolite_configure () {
 		#\$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 = "";
@@ -1132,7 +1130,7 @@ rule_runit_configure () {
 		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
@@ -1153,7 +1151,7 @@ rule_runit_configure () {
 		 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;;
@@ -1287,6 +1285,7 @@ rule_user_add () { # SYNTAX: $user
 	 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
@@ -1331,7 +1330,7 @@ rule_user_configure () {
 		    ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac
 		EOF
 	sudo install -m 640 -o root -g root /dev/stdin /etc/sudoers.d/etckeeper-unclean <<-EOF
-		%sudo ALL=(ALL) NOPASSWD: /usr/sbin/etckeeper unclean
+		%sudo ALL=(ALL) NOPASSWD: /usr/bin/etckeeper unclean
 		EOF
 	sudo install -m 640 -o root -g root /dev/stdin /etc/sudoers.d/env_keep <<-EOF
 		Defaults env_keep = " \\
@@ -1387,7 +1386,7 @@ rule_user_root_configure () {
 			$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