X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=874c3e86c9de9139f44a2ad137dcee9d46a01fbe;hb=1b69bb46f4838ebde163115977e310e7346a08c9;hp=3553389c5e2312d965c7c26eb9ec78bc2ef8dda5;hpb=e582b3d5151808b0247bf242ef3762b84f7d072e;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index 3553389..874c3e8 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -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
@@ -568,7 +565,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 +1129,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 +1150,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 +1284,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