Merge pull request #257 from nilshamerlinck/dbfilter2

Allow to pass DB_FILTER env var on 15.0/16.0 as well
camptocamp · Oct 19, 2023 · dcf64f7 · dcf64f7
2 parents d427a34 + 1e050d1
commit dcf64f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/15.0/templates/odoo.cfg.tmpl b/15.0/templates/odoo.cfg.tmpl
@@ -7,7 +7,7 @@ db_name = {{ .Env.DB_NAME }}
 db_user = {{ .Env.DB_USER }}
 db_password = {{ .Env.DB_PASSWORD }}
 db_sslmode = {{ default .Env.DB_SSLMODE "prefer" }}
-dbfilter = ^{{ default .Env.DB_NAME "odoodb" }}$
+dbfilter = ^{{ default .Env.DB_FILTER .Env.DB_NAME }}$
 list_db = {{ default .Env.LIST_DB "False" }}
 admin_passwd = {{ default .Env.ADMIN_PASSWD "" }}
 db_maxconn = {{ default .Env.DB_MAXCONN "64" }}

diff --git a/16.0/templates/odoo.cfg.tmpl b/16.0/templates/odoo.cfg.tmpl
@@ -7,7 +7,7 @@ db_name = {{ .Env.DB_NAME }}
 db_user = {{ .Env.DB_USER }}
 db_password = {{ .Env.DB_PASSWORD }}
 db_sslmode = {{ default .Env.DB_SSLMODE "prefer" }}
-dbfilter = ^{{ default .Env.DB_NAME "odoodb" }}$
+dbfilter = ^{{ default .Env.DB_FILTER .Env.DB_NAME }}$
 list_db = {{ default .Env.LIST_DB "False" }}
 admin_passwd = {{ default .Env.ADMIN_PASSWD "" }}
 db_maxconn = {{ default .Env.DB_MAXCONN "64" }}