From c1bac94c00ccdb995e673fe95d50d6f4acb3b577 Mon Sep 17 00:00:00 2001 From: Benjamin Bohard Date: Mon, 6 Apr 2020 17:16:30 +0200 Subject: [PATCH 1/2] Rename script to use with run_parts --- ...ix-postgresql-permissions.sh => 01-fix-postgresql-permissions} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename postservice/{01-fix-postgresql-permissions.sh => 01-fix-postgresql-permissions} (100%) diff --git a/postservice/01-fix-postgresql-permissions.sh b/postservice/01-fix-postgresql-permissions similarity index 100% rename from postservice/01-fix-postgresql-permissions.sh rename to postservice/01-fix-postgresql-permissions From 81f0635ef2630d04f8fa798ce6f0eb6655ed64b9 Mon Sep 17 00:00:00 2001 From: Benjamin Bohard Date: Mon, 6 Apr 2020 17:21:40 +0200 Subject: [PATCH 2/2] Fixes privilegies declaration in eoledb template --- tmpl/risotto.yml | 7 ++++++- tmpl/tiramisu.yml | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tmpl/risotto.yml b/tmpl/risotto.yml index 6d91aed..8f8e7c1 100644 --- a/tmpl/risotto.yml +++ b/tmpl/risotto.yml @@ -1,9 +1,14 @@ +%set %%dbname = %%getVar('risotto_main_dbname') --- dbuser: %%getVar('risotto_db_user') +dbuser_options: + - LOGIN +privileges: + %%{dbname}.public: 'ALL' dbhost: %%getVar('risotto_db_address') dbport: 5432 dbtype: postgres -dbname: %%getVar('risotto_main_dbname') +dbname: %%dbname template: 'postgres' sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql'] pwd_files: diff --git a/tmpl/tiramisu.yml b/tmpl/tiramisu.yml index 8d3c444..a97cebf 100644 --- a/tmpl/tiramisu.yml +++ b/tmpl/tiramisu.yml @@ -1,5 +1,10 @@ +%set %%dbname = %%getVar('risotto_tiramisu_dbname') --- dbuser: %%getVar('risotto_tiramisu_db_user') +dbuser_options: + - LOGIN +privileges: + %%{dbname}.public: 'ALL' dbhost: %%getVar('risotto_db_address') dbport: 5432 dbtype: postgres