X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=8a6c8d2b5213b0a8069a1ed1a6174eff09cbd534;hb=dae8fe647e7f10f8578a9bd6b64122df1b3f4e88;hp=3649341fb152459388d71b57154a3c6ba5e89294;hpb=82f0ba3e09ca73635984d0592bc44fef88b391c3;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index 3649341..8a6c8d2 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -41,7 +41,7 @@ rule_git_configure () {
 		 (refs/remotes/master)
 			cd ..
 			git --git-dir=\$PWD/.git checkout -f -B master remotes/master
-			git --git-dir=\$PWD/.git clean -f -d -
+			git --git-dir=\$PWD/.git clean -f -d -x
 			;;
 		 esac
 		EOF
@@ -599,7 +599,7 @@ rule_gitolite_configure () {
 		rmdir "$home"/etc/gitolite/"$d"
 	 done
 	rule apt_get_install gitweb highlight
-	#sudo sv restart spawn-fcgi.git.80.git.heureux-cyclage.org
+	#sudo sv restart fcgi.git.80.git.heureux-cyclage.org
 	#sudo sv restart git-daemon.git.9418
  }
 rule_locales_configure () {
@@ -726,7 +726,6 @@ rule_mysql_configure () {
 		/home/mysql
 	    sudo -u mysql mysql_install_db --no-defaults --datadir=/home/mysql/
 	fi
-	sudo service mysql restart
  }
 rule_network_configure () {
 	sudo install -m 644 -o root -g root /dev/stdin /etc/hostname <<-EOF
@@ -1139,6 +1138,7 @@ rule_runit_configure () {
 			"$tool"/etc/sv/"$sv"/configure
 		 then
 			ln -fns ../sv/"$sv" /etc/service/"$sv"
+			test ! -e /etc/sv/"$sv"/supervise/ok ||
 			sv restart "$sv"
 		 fi
 	 done