Merge pull request #72 from gurneyalex/fix-database-params

[FIX] database connection parameters
camptocamp · Jan 9, 2024 · d905994 · d905994
2 parents 65fbb29 + 15fd066
commit d905994
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -7,3 +7,8 @@ Contributors
 ------------
 
 - Leonardo Pistone (Camptocamp)
+- Sébastien Alix (Camptocamp)
+- Simone Orsi (Camptocamp)
+- Iván Todorovitch (Camptocamp)
+- Yannick Vaucher (Camptocamp)
+- Alexandre Fayolle (Camptocamp)
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -13,6 +13,8 @@ Unreleased
 **Improvements**
 
 **Build**
+* Prevent text from bouncing in maintenance page
+* allow connecting to a local database server without password (using ident)
 
 
 0.11.0 (2023-09-12)

diff --git a/README.rst b/README.rst
@@ -49,7 +49,7 @@ Options
     +-------------------+----------+---------------------------+-------------------------------------------------------------------+
     | --db-port         | -p       | MARABUNTA_DB_PORT         | Database port (defaults to 5432).                                 |
     +-------------------+----------+---------------------------+-------------------------------------------------------------------+
-    | --db-host         | -H       | MARABUNTA_DB_HOST         | Database port (defaults to localhost).                            |
+    | --db-host         | -H       | MARABUNTA_DB_HOST         | Database port (defaults to None).                                 |
     +-------------------+----------+---------------------------+-------------------------------------------------------------------+
     | --mode            |          | MARABUNTA_MODE            | Mode marabunta runs in for different envs.                        |
     +-------------------+----------+---------------------------+-------------------------------------------------------------------+

diff --git a/marabunta/config.py b/marabunta/config.py
@@ -118,15 +118,15 @@ def get_args_parser():
     parser.add_argument('--db-password', '-w',
                         action=EnvDefault,
                         envvar='MARABUNTA_DB_PASSWORD',
-                        required=True,
+                        required=False,
                         help="Odoo's database password")
     parser.add_argument('--db-port', '-p',
                         type=int,
                         default=os.environ.get('MARABUNTA_DB_PORT', 5432),
                         help="Odoo's database port")
     parser.add_argument('--db-host', '-H',
                         default=os.environ.get('MARABUNTA_DB_HOST',
-                                               'localhost'),
+                                               None),
                         help="Odoo's database host")
     parser.add_argument('--mode',
                         action=EnvDefault,