Modifications : etc/nsd3/zone.d/ptitvelo.net.zone.m4

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

diff --git a/etc/sv/openerp_cyclofficines/local.sh b/etc/sv/openerp_cyclofficines/local.sh
index e6887a3..bafe79e 100644 (file)
--- a/etc/sv/openerp_cyclofficines/local.sh
+++ b/etc/sv/openerp_cyclofficines/local.sh
@@ -32,29 +32,28 @@ sudo ln -fns \
 
 while ! sudo -u postgres psql </dev/null
 do sleep 1; done
-"$tool"/local/postgresql-role-create "$sv"
+"$tool"/local/postgresql-user-create "$sv"
 for db in \
        openerp_cyclo_ivry \
        openerp_cyclo_paris_est
  do
-       "$tool"/local/postgresql-user-create "$db"
-       "$tool"/local/postgresql-database-create "$db"
+       #"$tool"/local/postgresql-role-create "$db"
+       "$tool"/local/postgresql-database-create "$db" "$sv"
        sudo install -d -m 750 -o "$sv" -g "$sv" \
         "$home"/etc \
         /etc/openerp/"$db"
+       sudo -u postgres psql -AqtX "$db" <<-EOF
+               \set ON_ERROR_STOP on
+               GRANT USAGE  ON SCHEMA pg_catalog               TO $sv;
+               GRANT SELECT ON TABLE  pg_catalog.pg_attribute  TO $sv;
+               GRANT SELECT ON TABLE  pg_catalog.pg_class      TO $sv;
+               GRANT SELECT ON TABLE  pg_catalog.pg_constraint TO $sv;
+               GRANT SELECT ON TABLE  pg_catalog.pg_indexes    TO $sv;
+               GRANT SELECT ON TABLE  pg_catalog.pg_proc       TO $sv;
+               GRANT SELECT ON TABLE  pg_catalog.pg_type       TO $sv;
+               EOF
  done
 
-sudo -u postgres psql -AqtX "$sv" <<-EOF
-       \set ON_ERROR_STOP on
-       GRANT USAGE  ON SCHEMA pg_catalog               TO $sv;
-       GRANT SELECT ON TABLE  pg_catalog.pg_attribute  TO $sv;
-       GRANT SELECT ON TABLE  pg_catalog.pg_class      TO $sv;
-       GRANT SELECT ON TABLE  pg_catalog.pg_constraint TO $sv;
-       GRANT SELECT ON TABLE  pg_catalog.pg_indexes    TO $sv;
-       GRANT SELECT ON TABLE  pg_catalog.pg_proc       TO $sv;
-       GRANT SELECT ON TABLE  pg_catalog.pg_type       TO $sv;
-       EOF
-
 sudo adduser git   "$sv"-addon
 sudo adduser "$sv" "$sv"-addon
 sudo adduser "$sv" postgres-data
@@ -104,5 +103,4 @@ for addon in \
                 esac
                EOF
  done
-
 exit 42