diff -r c0b7687bce3d -r 329b4f6d18b4 cwconfig.py --- a/cwconfig.py Mon Apr 19 12:42:54 2010 +0200 +++ b/cwconfig.py Mon Apr 19 12:43:23 2010 +0200 @@ -299,28 +299,28 @@ {'type' : 'string', # XXX use a dedicated type? 'default': 'WARNING', 'help': 'server\'s log level', - 'group': 'main', 'inputlevel': 1, + 'group': 'main', 'level': 1, }), # pyro options ('pyro-instance-id', {'type' : 'string', 'default': Method('default_instance_id'), 'help': 'identifier of the CubicWeb instance in the Pyro name server', - 'group': 'pyro', 'inputlevel': 1, + 'group': 'pyro', 'level': 1, }), ('pyro-ns-host', {'type' : 'string', 'default': '', 'help': 'Pyro name server\'s host. If not set, will be detected by a \ broadcast query. It may contains port information using : notation.', - 'group': 'pyro', 'inputlevel': 1, + 'group': 'pyro', 'level': 1, }), ('pyro-ns-group', {'type' : 'string', 'default': 'cubicweb', 'help': 'Pyro name server\'s group where the repository will be \ registered.', - 'group': 'pyro', 'inputlevel': 1, + 'group': 'pyro', 'level': 1, }), # common configuration options which are potentially required as soon as # you're using "base" application objects (ie to really server/web @@ -329,13 +329,13 @@ {'type' : 'string', 'default': None, 'help': 'web server root url', - 'group': 'main', 'inputlevel': 1, + 'group': 'main', 'level': 1, }), ('allow-email-login', {'type' : 'yn', 'default': False, 'help': 'allow users to login with their primary email if set', - 'group': 'main', 'inputlevel': 2, + 'group': 'main', 'level': 2, }), ('use-request-subdomain', {'type' : 'yn', @@ -343,14 +343,14 @@ 'help': ('if set, base-url subdomain is replaced by the request\'s ' 'host, to help managing sites with several subdomains in a ' 'single cubicweb instance'), - 'group': 'main', 'inputlevel': 1, + 'group': 'main', 'level': 1, }), ('mangle-emails', {'type' : 'yn', 'default': False, 'help': "don't display actual email addresses but mangle them if \ this option is set to yes", - 'group': 'email', 'inputlevel': 2, + 'group': 'email', 'level': 2, }), ) # static and class methods used to get instance independant resources ## @@ -743,34 +743,34 @@ {'type' : 'string', 'default': Method('default_log_file'), 'help': 'file where output logs should be written', - 'group': 'main', 'inputlevel': 2, + 'group': 'main', 'level': 2, }), # email configuration ('smtp-host', {'type' : 'string', 'default': 'mail', 'help': 'hostname of the SMTP mail server', - 'group': 'email', 'inputlevel': 1, + 'group': 'email', 'level': 1, }), ('smtp-port', {'type' : 'int', 'default': 25, 'help': 'listening port of the SMTP mail server', - 'group': 'email', 'inputlevel': 1, + 'group': 'email', 'level': 1, }), ('sender-name', {'type' : 'string', 'default': Method('default_instance_id'), 'help': 'name used as HELO name for outgoing emails from the \ repository.', - 'group': 'email', 'inputlevel': 2, + 'group': 'email', 'level': 2, }), ('sender-addr', {'type' : 'string', 'default': 'cubicweb@mydomain.com', 'help': 'email address used as HELO address for outgoing emails from \ the repository', - 'group': 'email', 'inputlevel': 1, + 'group': 'email', 'level': 1, }), )