From a61714e00dcdee2cf3a1a461cf5fd58070097ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Br=C3=BCckl?= Date: Fri, 18 Nov 2016 10:24:01 +0100 Subject: [PATCH] update puppet --- .../odoo/templates/odoo-server.conf.erb | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/setup/puppet/modules/odoo/templates/odoo-server.conf.erb b/setup/puppet/modules/odoo/templates/odoo-server.conf.erb index 06a57feb..c0c33569 100644 --- a/setup/puppet/modules/odoo/templates/odoo-server.conf.erb +++ b/setup/puppet/modules/odoo/templates/odoo-server.conf.erb @@ -1,24 +1,21 @@ [options] -addons_path = /opt/odoo/ext/odoo/addons,/opt/odoo/ext/custom-addons -admin_passwd = <%= @master_pw %> +addons_path = ~/ext/ext/custom-addons,~/ext/ext/odoo/addons,~/ext/ext/enterprise-addons +admin_passwd = 9f8TTx34kk23 db_host = False db_name = False db_password = False db_port = False -db_user = odoo +db_user = False debug_mode = False list_db = True -log_level = error -logfile = /var/log/odoo/<%= @master_pw %>/odoo-server.log +log_level = info -max_cron_threads = 1 -workers = 1 - -#xmlrpc_interface = 127.0.0.1 -xmlrpc_port = 8069 +#max_cron_threads = 1 +workers = 0 +xmlrpc_interface = 127.0.0.1 timezone = Europe/Brussels # 5 min @@ -33,4 +30,3 @@ limit_time_real = 6000 # if DB > 150MB, otherwise "AccessDenied" error occurs # 10 GB limit_memory_hard = 10000000000 -