Wok is loading the root configuration for every plugin, so there is no need to keep it in kimchi.conf file. Also the Kimchi configuration file should only contain data that can be edited by user, which is not the case of the cherrypy configuration. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- kimchi.conf | 13 ------------- tests/test_config.py.in | 5 ++--- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/kimchi.conf b/kimchi.conf index 9e0f20d..c451703 100644 --- a/kimchi.conf +++ b/kimchi.conf @@ -15,16 +15,3 @@ SERIAL_CONSOLE_TIMEOUT = 120 # Automatically create ISO pool on server start up create_iso_pool = True - -[/] -tools.trailing_slash.on = False -request.methods_with_bodies = ('POST', 'PUT') -tools.nocache.on = True -tools.proxy.on = True -tools.sessions.on = True -tools.sessions.name = 'wok' -tools.sessions.secure = True -tools.sessions.httponly = True -tools.sessions.locking = 'explicit' -tools.sessions.storage_type = 'ram' -tools.sessions.timeout = 10 diff --git a/tests/test_config.py.in b/tests/test_config.py.in index 0ff93b8..48abd5b 100644 --- a/tests/test_config.py.in +++ b/tests/test_config.py.in @@ -20,7 +20,7 @@ import unittest from cherrypy.lib.reprconf import Parser -from wok.config import CACHEEXPIRES, SESSIONSTIMEOUT +from wok.config import CACHEEXPIRES from wok.config import Paths, PluginPaths from wok.plugins.kimchi.config import get_screenshot_path @@ -94,8 +94,7 @@ class ConfigTests(unittest.TestCase): 'tools.sessions.secure': True, 'tools.sessions.httponly': True, 'tools.sessions.locking': 'explicit', - 'tools.sessions.storage_type': 'ram', - 'tools.sessions.timeout': SESSIONSTIMEOUT + 'tools.sessions.storage_type': 'ram' }, '/novnc': { 'tools.wokauth.on': True, -- 2.5.5