From 006839796496f0577e6cd3f78344360233ac94c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Vald=C3=A9s?= Date: Tue, 3 Oct 2023 07:04:27 -0300 Subject: [PATCH] [bitnami/odoo] Add database filter (#50435) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add database filter env var Signed-off-by: Luis Valdes * Fix unbound variable Signed-off-by: Luis Valdés * Update docs Signed-off-by: Luis Valdes * Add version 14 and 15 Signed-off-by: Luis Valdes --------- Signed-off-by: Luis Valdes Signed-off-by: Luis Valdés --- .../odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh | 2 ++ .../opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl | 2 +- .../odoo/15/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh | 2 ++ .../opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl | 2 +- .../odoo/16/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh | 2 ++ .../opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl | 2 +- bitnami/odoo/README.md | 1 + 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh b/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh index e485f0011e3e..c02e1c6469c1 100644 --- a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh +++ b/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh @@ -42,6 +42,7 @@ odoo_env_vars=( ODOO_DATABASE_NAME ODOO_DATABASE_USER ODOO_DATABASE_PASSWORD + ODOO_DATABASE_FILTER SMTP_HOST SMTP_PORT ODOO_SMTP_PORT @@ -94,6 +95,7 @@ export ODOO_LONGPOLLING_PORT_NUMBER="${ODOO_LONGPOLLING_PORT_NUMBER:-8072}" # on export ODOO_SKIP_BOOTSTRAP="${ODOO_SKIP_BOOTSTRAP:-no}" # only used during the first initialization export ODOO_SKIP_MODULES_UPDATE="${ODOO_SKIP_MODULES_UPDATE:-no}" # only used during the first initialization export ODOO_LOAD_DEMO_DATA="${ODOO_LOAD_DEMO_DATA:-no}" # only used during the first initialization +export ODOO_DATABASE_FILTER="${ODOO_DATABASE_FILTER:-.*}" # Odoo credentials export ODOO_EMAIL="${ODOO_EMAIL:-user@example.com}" # only used during the first initialization diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl b/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl index ca6f630617e2..fd582197078f 100644 --- a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl +++ b/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl @@ -12,7 +12,7 @@ db_port = {{ODOO_DATABASE_PORT_NUMBER}} ; https://www.postgresql.org/docs/current/manage-ag-templatedbs.html db_template = template1 db_user = {{ODOO_DATABASE_USER}} -dbfilter = .* +dbfilter = {{ODOO_DATABASE_FILTER}} debug_mode = False email_from = {{ODOO_EMAIL}} http_port = {{ODOO_PORT_NUMBER}} diff --git a/bitnami/odoo/15/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh b/bitnami/odoo/15/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh index e485f0011e3e..c02e1c6469c1 100644 --- a/bitnami/odoo/15/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh +++ b/bitnami/odoo/15/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh @@ -42,6 +42,7 @@ odoo_env_vars=( ODOO_DATABASE_NAME ODOO_DATABASE_USER ODOO_DATABASE_PASSWORD + ODOO_DATABASE_FILTER SMTP_HOST SMTP_PORT ODOO_SMTP_PORT @@ -94,6 +95,7 @@ export ODOO_LONGPOLLING_PORT_NUMBER="${ODOO_LONGPOLLING_PORT_NUMBER:-8072}" # on export ODOO_SKIP_BOOTSTRAP="${ODOO_SKIP_BOOTSTRAP:-no}" # only used during the first initialization export ODOO_SKIP_MODULES_UPDATE="${ODOO_SKIP_MODULES_UPDATE:-no}" # only used during the first initialization export ODOO_LOAD_DEMO_DATA="${ODOO_LOAD_DEMO_DATA:-no}" # only used during the first initialization +export ODOO_DATABASE_FILTER="${ODOO_DATABASE_FILTER:-.*}" # Odoo credentials export ODOO_EMAIL="${ODOO_EMAIL:-user@example.com}" # only used during the first initialization diff --git a/bitnami/odoo/15/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl b/bitnami/odoo/15/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl index ca6f630617e2..fd582197078f 100644 --- a/bitnami/odoo/15/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl +++ b/bitnami/odoo/15/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl @@ -12,7 +12,7 @@ db_port = {{ODOO_DATABASE_PORT_NUMBER}} ; https://www.postgresql.org/docs/current/manage-ag-templatedbs.html db_template = template1 db_user = {{ODOO_DATABASE_USER}} -dbfilter = .* +dbfilter = {{ODOO_DATABASE_FILTER}} debug_mode = False email_from = {{ODOO_EMAIL}} http_port = {{ODOO_PORT_NUMBER}} diff --git a/bitnami/odoo/16/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh b/bitnami/odoo/16/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh index e485f0011e3e..c02e1c6469c1 100644 --- a/bitnami/odoo/16/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh +++ b/bitnami/odoo/16/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh @@ -42,6 +42,7 @@ odoo_env_vars=( ODOO_DATABASE_NAME ODOO_DATABASE_USER ODOO_DATABASE_PASSWORD + ODOO_DATABASE_FILTER SMTP_HOST SMTP_PORT ODOO_SMTP_PORT @@ -94,6 +95,7 @@ export ODOO_LONGPOLLING_PORT_NUMBER="${ODOO_LONGPOLLING_PORT_NUMBER:-8072}" # on export ODOO_SKIP_BOOTSTRAP="${ODOO_SKIP_BOOTSTRAP:-no}" # only used during the first initialization export ODOO_SKIP_MODULES_UPDATE="${ODOO_SKIP_MODULES_UPDATE:-no}" # only used during the first initialization export ODOO_LOAD_DEMO_DATA="${ODOO_LOAD_DEMO_DATA:-no}" # only used during the first initialization +export ODOO_DATABASE_FILTER="${ODOO_DATABASE_FILTER:-.*}" # Odoo credentials export ODOO_EMAIL="${ODOO_EMAIL:-user@example.com}" # only used during the first initialization diff --git a/bitnami/odoo/16/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl b/bitnami/odoo/16/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl index ca6f630617e2..fd582197078f 100644 --- a/bitnami/odoo/16/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl +++ b/bitnami/odoo/16/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl @@ -12,7 +12,7 @@ db_port = {{ODOO_DATABASE_PORT_NUMBER}} ; https://www.postgresql.org/docs/current/manage-ag-templatedbs.html db_template = template1 db_user = {{ODOO_DATABASE_USER}} -dbfilter = .* +dbfilter = {{ODOO_DATABASE_FILTER}} debug_mode = False email_from = {{ODOO_EMAIL}} http_port = {{ODOO_PORT_NUMBER}} diff --git a/bitnami/odoo/README.md b/bitnami/odoo/README.md index 851344b1886c..6f33b1ff88c2 100644 --- a/bitnami/odoo/README.md +++ b/bitnami/odoo/README.md @@ -223,6 +223,7 @@ Available environment variables: - `ODOO_DATABASE_PORT_NUMBER`: Port used by the PostgreSQL server. Default: **5432** - `ODOO_DATABASE_ADMIN_USER`: Database admin user that Odoo will use to connect with the database. Default: **postgres** - `ODOO_DATABASE_ADMIN_PASSWORD`: Database admin password that Odoo will use to connect with the database. No default. +- `ODOO_DATABASE_FILTER`: Apply a regex to filter a specific pattern or match for a database name: Default: .* - `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no** #### Create a database for Odoo using postgresql-client