From f3c9d3b533636b7e562e78ab140e2d5c32b5dbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Tue, 11 Oct 2022 14:17:03 +0200 Subject: [PATCH 1/2] [FIX] odoo.cfg to odoo.conf Close issue #8 --- README.md | 4 ++-- odoo_openupgrade_wizard/cli/cli_init.py | 4 ++-- .../templates/odoo/{odoo.cfg.j2 => odoo.conf.j2} | 0 odoo_openupgrade_wizard/tools/tools_odoo.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename odoo_openupgrade_wizard/templates/odoo/{odoo.cfg.j2 => odoo.conf.j2} (100%) diff --git a/README.md b/README.md index 104ed87..19d11d5 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ src/ env_10.0/ extra_debian_requirements.txt Dockerfile - odoo.cfg + odoo.conf extra_python_requirements.txt repos.yml src/ @@ -133,7 +133,7 @@ modules.csv - ``extra_debian_requirements.txt`` enumerates the list of extra system librairies required to run the odoo instance. - - ``odoo.cfg`` file. Add here extra configuration required for your custom modules. + - ``odoo.conf`` file. Add here extra configuration required for your custom modules. the classical keys (``db_host``, ``db_port``, etc...) are automatically autogenerated. diff --git a/odoo_openupgrade_wizard/cli/cli_init.py b/odoo_openupgrade_wizard/cli/cli_init.py index d207cb4..cbf532e 100644 --- a/odoo_openupgrade_wizard/cli/cli_init.py +++ b/odoo_openupgrade_wizard/cli/cli_init.py @@ -145,8 +145,8 @@ def init( # Create odoo config file ensure_file_exists_from_template( - path_version / Path("odoo.cfg"), - "odoo/odoo.cfg.j2", + path_version / Path("odoo.conf"), + "odoo/odoo.conf.j2", ) # Create repos.yml file for gitaggregate tools diff --git a/odoo_openupgrade_wizard/templates/odoo/odoo.cfg.j2 b/odoo_openupgrade_wizard/templates/odoo/odoo.conf.j2 similarity index 100% rename from odoo_openupgrade_wizard/templates/odoo/odoo.cfg.j2 rename to odoo_openupgrade_wizard/templates/odoo/odoo.conf.j2 diff --git a/odoo_openupgrade_wizard/tools/tools_odoo.py b/odoo_openupgrade_wizard/tools/tools_odoo.py index b36ddcd..e4e1a22 100644 --- a/odoo_openupgrade_wizard/tools/tools_odoo.py +++ b/odoo_openupgrade_wizard/tools/tools_odoo.py @@ -112,9 +112,9 @@ def generate_odoo_command( odoo_env_path = get_odoo_env_path(ctx, migration_step["version"]) # Compute 'server_wide_modules' - # For that purpose, read the custom odoo.cfg file + # For that purpose, read the custom odoo.conf file # to know if server_wide_modules is defined - custom_odoo_config_file = odoo_env_path / "odoo.cfg" + custom_odoo_config_file = odoo_env_path / "odoo.conf" parser = configparser.RawConfigParser() parser.read(custom_odoo_config_file) server_wide_modules = parser.get( @@ -160,7 +160,7 @@ def generate_odoo_command( result = ( f" {command}" f" {shell_cmd}" - f" --config=/odoo_env/odoo.cfg" + f" --config=/odoo_env/odoo.conf" f" --data-dir=/env/filestore/" f" --addons-path={addons_path}" f" --logfile={log_file_docker_path}" From 6d0d6f355e15e64835e3dfa638fa248de5a9be07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Tue, 11 Oct 2022 16:01:08 +0200 Subject: [PATCH 2/2] [IMP] documentation about odoo.conf Close #9 --- odoo_openupgrade_wizard/templates/odoo/odoo.conf.j2 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/odoo_openupgrade_wizard/templates/odoo/odoo.conf.j2 b/odoo_openupgrade_wizard/templates/odoo/odoo.conf.j2 index e69de29..74eb2b7 100644 --- a/odoo_openupgrade_wizard/templates/odoo/odoo.conf.j2 +++ b/odoo_openupgrade_wizard/templates/odoo/odoo.conf.j2 @@ -0,0 +1,9 @@ +# This file can be left empty +# The following standard parameters are generated automatically and are +# not required to be found in this file: +# - addons_path +# - connection parameters to the database +# - database name +# - http or xml port +# - etc. +# Only non standard or special options should be specified here.