--- a/server/serverconfig.py Tue Sep 21 16:35:37 2010 +0200
+++ b/server/serverconfig.py Thu Sep 23 23:28:58 2010 +0200
@@ -45,15 +45,27 @@
)
class SourceConfiguration(Configuration):
- def __init__(self, appid, options):
- self.appid = appid # has to be done before super call
+ def __init__(self, appconfig, options):
+ self.appconfig = appconfig # has to be done before super call
super(SourceConfiguration, self).__init__(options=options)
# make Method('default_instance_id') usable in db option defs (in native.py)
def default_instance_id(self):
- return self.appid
+ return self.appconfig.appid
-def generate_sources_file(appid, sourcesfile, sourcescfg, keys=None):
+ def input_option(self, option, optdict, inputlevel):
+ if self['db-driver'] == 'sqlite':
+ if option in ('db-user', 'db-password'):
+ return
+ if option == 'db-name':
+ optdict = optdict.copy()
+ optdict['help'] = 'path to the sqlite database'
+ optdict['default'] = join(self.appconfig.appdatahome,
+ self.appconfig.appid + '.sqlite')
+ super(SourceConfiguration, self).input_option(option, optdict, inputlevel)
+
+
+def generate_sources_file(appconfig, sourcesfile, sourcescfg, keys=None):
"""serialize repository'sources configuration into a INI like file
the `keys` parameter may be used to sort sections
@@ -73,7 +85,7 @@
options = USER_OPTIONS
else:
options = SOURCE_TYPES[sconfig['adapter']].options
- _sconfig = SourceConfiguration(appid, options=options)
+ _sconfig = SourceConfiguration(appconfig, options=options)
for attr, val in sconfig.items():
if attr == 'uri':
continue
@@ -278,7 +290,7 @@
if exists(sourcesfile):
import shutil
shutil.copy(sourcesfile, sourcesfile + '.bak')
- generate_sources_file(self.appid, sourcesfile, sourcescfg,
+ generate_sources_file(self, sourcesfile, sourcescfg,
['admin', 'system'])
restrict_perms_to_user(sourcesfile)