Ajout : roundcube.

[lhc/ateliers.git] / etc / sv / sympa / local.sh

diff --git a/etc/sv/sympa/local.sh b/etc/sv/sympa/local.sh
index ae7c1dc..81ba013 100644 (file)
--- a/etc/sv/sympa/local.sh
+++ b/etc/sv/sympa/local.sh
@@ -5,8 +5,7 @@ home=/home/sympa
 while ! sudo -u postgres psql </dev/null
 do sleep 1; done
 "$tool"/local/postgresql-user-create "$sv"
-sudo -u postgres psql template1 -a -f - <<-EOF
-       \set ON_ERROR_STOP on
+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,15 +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 - <<-EOF
-       \set ON_ERROR_STOP on
+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