X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=94916c6931abdbbc364e2bfc794e3edd09d06a3f;hb=f908591b3c705b257eacf8f0c6096f16f251d966;hp=f4d741a0b02658046dc0baf672f55c9c2ed8fe08;hpb=8a5e80558ba5412ca5156256fbb37542f385e703;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index f4d741a..94916c6 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -35,6 +35,16 @@ rule_git_configure () {
 	tool=$(cd "$tool"; cd -)
 	sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
 	sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/vm
+	sudo install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
+		#!/bin/sh -efux
+		case \$1 in
+		 (refs/remotes/master)
+			cd ..
+			git --git-dir=\$PWD/.git checkout -f -B master remotes/master
+			git --git-dir=\$PWD/.git clean -f -d -
+			;;
+		 esac
+		EOF
 	)
  }
 rule_git_reset () {
@@ -208,7 +218,7 @@ rule_apache2_configure () {
 		 /etc/apache2/site.d/"$site" \
 		 /home/www/etc/apache2/"$site"
 		test -e /home/www/pub/"$site" ||
-		sudo install -d -m 770 -o www."$site" -g www."$site" \
+		sudo install -d -m 2770 -o www."$site" -g www."$site" \
 		 /home/www/pub/"$site"
 		getent passwd www."$site" >/dev/null ||
 		sudo adduser \
@@ -711,12 +721,11 @@ rule_mysql_configure () {
 	sudo install -m 644 -o root -g root \
 	    "$tool"/etc/mysql/my.cnf \
 	    /etc/mysql/my.cnf
-	if test -d /home/mysql; then
+	if test ! -d /home/mysql; then
 	    sudo install -d -m 750 -o mysql -g mysql \
 		/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
@@ -786,7 +795,7 @@ rule_www_configure () {
 	sudo install -d -m 750 -o www -g www \
 	 /home/www/etc
 	sudo install -d -m 1771 -o www-data -g www-data \
-	 /home/www/pub \
+	 /home/www/pub
 	sudo install -d -m 1771 -o log.www -g log.www \
 	 /home/www/log
  }
@@ -1027,6 +1036,7 @@ rule_postfix_configure () {
 		abuse: root
 		admin: root
 		contact: root
+		mailer-daemon: root
 		postmaster: root
 		root: $(getent group sudo | cut -f 4 -d : | tr , ' ')
 		EOF
@@ -1128,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