X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fsv%2Fsympa%2Flocal.sh;h=81ba0136338da2a582739f7f19d6a4afd501a017;hb=b75d4503ef9c919231c0c02daf5a1ed1e57c73af;hp=06f436aa7223bc88cef9267c095ac2fd7021bed2;hpb=0d705d8e2a919ee40866307aa3e18b1a5c4e7583;p=lhc%2Fateliers.git

diff --git a/etc/sv/sympa/local.sh b/etc/sv/sympa/local.sh
index 06f436a..81ba013 100644
--- a/etc/sv/sympa/local.sh
+++ b/etc/sv/sympa/local.sh
@@ -4,9 +4,8 @@ home=/home/sympa
 "$tool"/local/runit-sv-start     postgres
 while ! sudo -u postgres psql </dev/null
 do sleep 1; done
-~postgres/bin/createuser "$sv"
-sudo -u postgres psql template1 -a -f - <<-EOF
-	\set ON_ERROR_STOP on
+"$tool"/local/postgresql-user-create "$sv"
+sudo -u postgres psql template1 -a -f - --set ON_ERROR_STOP=1 <<-EOF
 	-- NOTE: pour /usr/share/sympa/lib/Upgrade.pm
 	--       appelant DBI->tables
 	GRANT USAGE  ON SCHEMA pg_catalog                TO $sv;
@@ -138,7 +137,7 @@ sudo install -m 600 -o root -g root /dev/stdin \
 		dbc_authmethod_user='ident'
 		dbc_basepath=''
 		dbc_dbadmin='postgres'
-		dbc_dbname='sympa'
+		dbc_dbname='$sv'
 		dbc_dbpass=''
 		dbc_dbport=''
 		dbc_dbserver='/run/postgresql'
@@ -151,9 +150,14 @@ sudo install -m 600 -o root -g root /dev/stdin \
 	EOF
 
 ! sudo etckeeper unclean ||
-sudo etckeeper commit -m "rule_runit_configure $sv"
+sudo etckeeper commit -m "runit-configure $sv"
 
 "$tool"/local/apt-get-install --no-install-recommends sympa
  # NOTE: évite d'installer apache2 ..
 
 "$tool"/local/insserv-remove sympa
+
+sudo -u postgres psql template1 -a -f - --set ON_ERROR_STOP=1 <<-EOF
+	REVOKE ALL ON DATABASE $sv FROM public;
+	GRANT ALL PRIVILEGES ON DATABASE $sv TO $sv;
+	EOF