Correction : openerp_cyclofficines : ne supprime pas les données secrètes à chaque...

[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..8c3b0df 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
@@ -64,6 +63,7 @@ for addon in \
        bikecoop_l10n_fr \
        pos_membership \
        remembership \
+       cyclofficine_ivry \
        cyclofficine_paris_est
  do
        sudo install -d -m 2771 -o "$sv" -g "$sv"-addon \
@@ -75,7 +75,7 @@ for addon in \
        sudo -u git git \
         --git-dir ~git-data/burette/"$addon".git \
         --work-tree="$home"/addon.d/"$addon" \
-        clean -d -f -f -x
+        clean -d -e sec/ -f -f -x
        sudo chmod a-x \
         /home/git/pub/burette/"$addon".git/hooks/post-update.sample
        sudo install -m 550 -o git -g git /dev/stdin \
@@ -98,11 +98,9 @@ for addon in \
                        git \\
                         --git-dir ~git-data/burette/"$addon".git \\
                         --work-tree="$home"/addon.d/"$addon" \\
-                        clean -d -f -f -x
+                        clean -d -e sec/ -f -f -x
                        #sv restart "$sv"
                        ;;
                 esac
                EOF
  done
-
-exit 42