From be2afc44babcc26453056f7ffbe045912da415c3 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 7 Jun 2010 14:56:17 +0200 Subject: [PATCH] process xmlrpcs options even if ssl is disabled bzr revid: al@openerp.com-20100607125617-sz8jtlt503o40ns7 --- bin/tools/config.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/bin/tools/config.py b/bin/tools/config.py index c39fc5a7dca..1a0886d00ff 100644 --- a/bin/tools/config.py +++ b/bin/tools/config.py @@ -259,16 +259,10 @@ class configmanager(object): 'db_port', 'list_db', 'logfile', 'pidfile', 'smtp_port', 'cache_timeout','smtp_ssl', 'email_from', 'smtp_server', 'smtp_user', 'smtp_password', 'price_accuracy', 'netrpc_interface', 'netrpc_port', 'db_maxconn', 'import_partial', 'addons_path', - 'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone',] - - if self.has_ssl: - keys.extend([ - 'xmlrpcs_interface', - 'xmlrpcs_port', - 'xmlrpcs', - 'secure_cert_file', - 'secure_pkey_file'] - ) + 'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone', + 'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs', + 'secure_cert_file', 'secure_pkey_file' + ] for arg in keys: if getattr(opt, arg): @@ -277,9 +271,8 @@ class configmanager(object): keys = ['language', 'translate_out', 'translate_in', 'debug_mode', 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', 'list_db', 'server_actions_allow_code'] - - if self.has_ssl: - keys.append('xmlrpcs') + + keys.append('xmlrpcs') for arg in keys: if getattr(opt, arg) is not None: