|
@@ -268,13 +268,15 @@ class WsgiDavDaemon(Daemon):
|
268
|
268
|
|
269
|
269
|
def _initConfig(self):
|
270
|
270
|
"""Setup configuration dictionary from default, command line and configuration file."""
|
|
271
|
+ from tg import config as tg_config
|
271
|
272
|
|
272
|
273
|
# Set config defaults
|
273
|
274
|
config = DEFAULT_CONFIG.copy()
|
274
|
275
|
temp_verbose = config["verbose"]
|
275
|
276
|
|
276
|
277
|
# Configuration file overrides defaults
|
277
|
|
- config_file = os.path.abspath(DEFAULT_CONFIG_FILE)
|
|
278
|
+ default_config_file = os.path.abspath(DEFAULT_CONFIG_FILE)
|
|
279
|
+ config_file = tg_config.get('wsgidav.config_path', default_config_file)
|
278
|
280
|
fileConf = self._readConfigFile(config_file, temp_verbose)
|
279
|
281
|
config.update(fileConf)
|
280
|
282
|
|