Skip to content
Snippets Groups Projects
Commit 976525ab28df authored by Vincent Hatakeyama's avatar Vincent Hatakeyama
Browse files

read database user and password from setup.cfg

parent 4ca84c7556a2
No related branches found
No related tags found
No related merge requests found
......@@ -229,8 +229,11 @@
if start_postgresql:
odoo_db_user = 'odoo'
else:
_logger.warning("No database user found or given")
if not odoo_db_user and c.has_option('odoo_scripts', 'db_user'):
odoo_db_user = c.get('odoo_scripts', 'db_user')
if not odoo_db_user:
_logger.warning("No database user found or given")
if not odoo_db_password:
if start_postgresql:
odoo_db_password = 'odoo'
else:
......@@ -233,8 +236,11 @@
if not odoo_db_password:
if start_postgresql:
odoo_db_password = 'odoo'
else:
_logger.warning("No database password found or given")
if not odoo_db_password and c.has_option('odoo_scripts', 'db_password'):
odoo_db_password = c.get('odoo_scripts', 'db_password')
if not odoo_db_password:
_logger.warning("No database password found or given")
# Do stuff
......
......@@ -325,6 +325,11 @@
modules.extend(glob.glob(entry))
_logger.debug("addon modules: %s", ','.join(modules))
if not db_user and c.has_option('odoo_scripts', 'db_user'):
db_user = c.get('odoo_scripts', 'db_user')
if not db_password and c.has_option('odoo_scripts', 'db_password'):
db_password = c.get('odoo_scripts', 'db_password')
registry = (
c.has_section('odoo_scripts') and
c.has_option('odoo_scripts', 'registry') and
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment