Merge branch 'rename-odoo-conf' into 'main'
[FIX] odoo.cfg to odoo.conf Closes #9 and #8 See merge request odoo-openupgrade-wizard/odoo-openupgrade-wizard!19
This commit is contained in:
commit
ec89747ee5
|
|
@ -81,7 +81,7 @@ src/
|
||||||
env_10.0/
|
env_10.0/
|
||||||
extra_debian_requirements.txt
|
extra_debian_requirements.txt
|
||||||
Dockerfile
|
Dockerfile
|
||||||
odoo.cfg
|
odoo.conf
|
||||||
extra_python_requirements.txt
|
extra_python_requirements.txt
|
||||||
repos.yml
|
repos.yml
|
||||||
src/
|
src/
|
||||||
|
|
@ -131,7 +131,7 @@ modules.csv
|
||||||
- ``extra_debian_requirements.txt`` enumerates the list of extra system librairies
|
- ``extra_debian_requirements.txt`` enumerates the list of extra system librairies
|
||||||
required to run the odoo instance.
|
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
|
the classical keys (``db_host``, ``db_port``, etc...) are automatically
|
||||||
autogenerated.
|
autogenerated.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -145,8 +145,8 @@ def init(
|
||||||
|
|
||||||
# Create odoo config file
|
# Create odoo config file
|
||||||
ensure_file_exists_from_template(
|
ensure_file_exists_from_template(
|
||||||
path_version / Path("odoo.cfg"),
|
path_version / Path("odoo.conf"),
|
||||||
"odoo/odoo.cfg.j2",
|
"odoo/odoo.conf.j2",
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create repos.yml file for gitaggregate tools
|
# Create repos.yml file for gitaggregate tools
|
||||||
|
|
|
||||||
9
odoo_openupgrade_wizard/templates/odoo/odoo.conf.j2
Normal file
9
odoo_openupgrade_wizard/templates/odoo/odoo.conf.j2
Normal file
|
|
@ -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.
|
||||||
|
|
@ -112,9 +112,9 @@ def generate_odoo_command(
|
||||||
odoo_env_path = get_odoo_env_path(ctx, migration_step["version"])
|
odoo_env_path = get_odoo_env_path(ctx, migration_step["version"])
|
||||||
|
|
||||||
# Compute 'server_wide_modules'
|
# 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
|
# 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 = configparser.RawConfigParser()
|
||||||
parser.read(custom_odoo_config_file)
|
parser.read(custom_odoo_config_file)
|
||||||
server_wide_modules = parser.get(
|
server_wide_modules = parser.get(
|
||||||
|
|
@ -160,7 +160,7 @@ def generate_odoo_command(
|
||||||
result = (
|
result = (
|
||||||
f" {command}"
|
f" {command}"
|
||||||
f" {shell_cmd}"
|
f" {shell_cmd}"
|
||||||
f" --config=/odoo_env/odoo.cfg"
|
f" --config=/odoo_env/odoo.conf"
|
||||||
f" --data-dir=/env/filestore/"
|
f" --data-dir=/env/filestore/"
|
||||||
f" --addons-path={addons_path}"
|
f" --addons-path={addons_path}"
|
||||||
f" --logfile={log_file_docker_path}"
|
f" --logfile={log_file_docker_path}"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user