# HG changeset patch # User Sylvain Thénault # Date 1274381128 -7200 # Node ID 9b7bdbfee68b96bdd9322c0e8bcc79cc4b5dbcbb # Parent 646737f80c886fa84eb5f85a65274d6031ce4701 [config] move web specific config to the web section of the configuration file diff -r 646737f80c88 -r 9b7bdbfee68b etwist/twconfig.py --- a/etwist/twconfig.py Thu May 20 20:45:21 2010 +0200 +++ b/etwist/twconfig.py Thu May 20 20:45:28 2010 +0200 @@ -39,18 +39,30 @@ options = merge_options(( # ctl configuration + ('port', + {'type' : 'int', + 'default': None, + 'help': 'http server port number (default to 8080)', + 'group': 'web', 'level': 0, + }), + ('max-post-length', + {'type' : 'bytes', + 'default': '100MB', + 'help': 'maximum length of HTTP request. Default to 100 MB.', + 'group': 'web', 'level': 1, + }), + ('profile', + {'type' : 'string', + 'default': None, + 'help': 'profile code and use the specified file to store stats if this option is set', + 'group': 'web', 'level': 3, + }), ('host', {'type' : 'string', 'default': None, 'help': 'host name if not correctly detectable through gethostname', 'group': 'main', 'level': 1, }), - ('port', - {'type' : 'int', - 'default': None, - 'help': 'http server port number (default to 8080)', - 'group': 'main', 'level': 0, - }), ('pid-file', {'type' : 'string', 'default': Method('default_pid_file'), @@ -64,24 +76,12 @@ the repository rather than the user running the command', 'group': 'main', 'level': WebConfiguration.mode == 'system' }), - ('max-post-length', - {'type' : 'bytes', - 'default': '100MB', - 'help': 'maximum length of HTTP request. Default to 100 MB.', - 'group': 'main', 'level': 1, - }), ('session-time', {'type' : 'time', 'default': '30min', 'help': 'session expiration time, default to 30 minutes', 'group': 'main', 'level': 1, }), - ('profile', - {'type' : 'string', - 'default': None, - 'help': 'profile code and use the specified file to store stats if this option is set', - 'group': 'main', 'level': 3, - }), ('pyro-server', {'type' : 'yn', # pyro is only a recommends by default, so don't activate it here diff -r 646737f80c88 -r 9b7bdbfee68b web/webconfig.py --- a/web/webconfig.py Thu May 20 20:45:21 2010 +0200 +++ b/web/webconfig.py Thu May 20 20:45:28 2010 +0200 @@ -83,20 +83,20 @@ {'type' : 'string', 'default': None, 'help': 'login of the CubicWeb user account to use for anonymous user (if you want to allow anonymous)', - 'group': 'main', 'level': 1, + 'group': 'web', 'level': 1, }), ('anonymous-password', {'type' : 'string', 'default': None, 'help': 'password of the CubicWeb user account to use for anonymous user, ' 'if anonymous-user is set', - 'group': 'main', 'level': 1, + 'group': 'web', 'level': 1, }), ('query-log-file', {'type' : 'string', 'default': None, 'help': 'web instance query log file', - 'group': 'main', 'level': 3, + 'group': 'web', 'level': 3, }), # web configuration ('https-url',