X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=fae784e9eb60335e894ae7f996ec0ce3f27307dd;hb=a69c7802612266236658a37bda14547fada629c4;hp=533ef85e7d4b0b4159ccb4d7e96de6be7d42b536;hpb=03bfcbb4b3d51ab2fac7e293336ba230fb0a5bc0;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index 533ef85..fae784e 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -1074,6 +1074,12 @@ rule_postfix_configure () {
  }
 rule_postgresql_configure () {
 	rule apt_get_install postgresql-9.1
+	if [ ! -d /var/lib/postgresql/9.1/ ]; then
+	    pg_createcluster -u postgres --start 9.1 main
+	fi
+	sudo install -m 660 -o root -g root \
+		"$tool"/etc/postgresql/9.1/main/postgresql.conf \
+		/etc/postgresql/9.1/main/postgresql.conf
 	sudo service postgresql restart
  }
 rule_openerp_configure () {
@@ -1123,7 +1129,7 @@ rule_runit_configure () {
 		 then
 			ln -fns ../sv/"$sv" /etc/service/"$sv"
 			sv restart "$sv"
-		 else
+		 fi
 	 done
  }
 rule_ssh_configure () {
@@ -1222,7 +1228,7 @@ rule_time_configure () {
 rule_user_add () { # SYNTAX: $user
 	rule user_configure
 	local user=$1
-	id "$user" >/dev/null ||
+	getent passwd "$user" >/dev/null ||
 	sudo adduser --disabled-password "$user"
 		# NOTE: le mot-de-passe doit être initialisé par l'utilisateur à l'aide de passwd-init .
 	eval local home\; home="~$user"