equal
deleted
inserted
replaced
25 |
25 |
26 import logilab.common.configuration as lgconfig |
26 import logilab.common.configuration as lgconfig |
27 from logilab.common.decorators import wproperty, cached |
27 from logilab.common.decorators import wproperty, cached |
28 |
28 |
29 from cubicweb.toolsutils import read_config, restrict_perms_to_user |
29 from cubicweb.toolsutils import read_config, restrict_perms_to_user |
30 from cubicweb.cwconfig import CONFIGURATIONS, CubicWebConfiguration, merge_options |
30 from cubicweb.cwconfig import CONFIGURATIONS, CubicWebConfiguration |
31 from cubicweb.server import SOURCE_TYPES |
31 from cubicweb.server import SOURCE_TYPES |
32 |
32 |
33 |
33 |
34 USER_OPTIONS = ( |
34 USER_OPTIONS = ( |
35 ('login', {'type' : 'string', |
35 ('login', {'type' : 'string', |
94 name = 'repository' |
94 name = 'repository' |
95 |
95 |
96 cubicweb_appobject_path = CubicWebConfiguration.cubicweb_appobject_path | set(['sobjects', 'hooks']) |
96 cubicweb_appobject_path = CubicWebConfiguration.cubicweb_appobject_path | set(['sobjects', 'hooks']) |
97 cube_appobject_path = CubicWebConfiguration.cube_appobject_path | set(['sobjects', 'hooks']) |
97 cube_appobject_path = CubicWebConfiguration.cube_appobject_path | set(['sobjects', 'hooks']) |
98 |
98 |
99 options = merge_options(( |
99 options = lgconfig.merge_options(( |
100 # ctl configuration |
100 # ctl configuration |
101 ('host', |
101 ('host', |
102 {'type' : 'string', |
102 {'type' : 'string', |
103 'default': None, |
103 'default': None, |
104 'help': 'host name if not correctly detectable through gethostname', |
104 'help': 'host name if not correctly detectable through gethostname', |