copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XTLS keys will be stored separate for each profile. 

Fixes #7735.
This commit is contained in:
Fedor Brunner 2014-04-15 12:42:09 +02:00
parent 3657642f58
commit 7e183d4515
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/configpaths.py
View File

@ -141,7 +141,7 @@ class ConfigPaths:
d = {'MY_DATA': '', 'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', d = {'MY_DATA': '', 'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem',
'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets',
'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities',
'PLUGINS_USER': 'plugins', 'MY_PEER_CERTS': 'certs', 'PLUGINS_USER': 'plugins',
'RNG_SEED': 'rng_seed'} 'RNG_SEED': 'rng_seed'}
for name in d: for name in d:
self.add(name, TYPE_DATA, windowsify(d[name])) self.add(name, TYPE_DATA, windowsify(d[name]))
@ -152,7 +152,6 @@ class ConfigPaths:
self.add(name, TYPE_CACHE, windowsify(d[name])) self.add(name, TYPE_CACHE, windowsify(d[name]))
self.add('MY_CONFIG', TYPE_CONFIG, '') self.add('MY_CONFIG', TYPE_CONFIG, '')
self.add('MY_CERT', TYPE_CONFIG, '')
basedir = fse(os.environ.get('GAJIM_BASEDIR', defs.basedir)) basedir = fse(os.environ.get('GAJIM_BASEDIR', defs.basedir))
self.add('DATA', None, os.path.join(basedir, windowsify('data'))) self.add('DATA', None, os.path.join(basedir, windowsify('data')))
@ -178,16 +177,23 @@ class ConfigPaths:
pidfile = windowsify('gajim') pidfile = windowsify('gajim')
secretsfile = windowsify('secrets') secretsfile = windowsify('secrets')
pluginsconfdir = windowsify('pluginsconfig') pluginsconfdir = windowsify('pluginsconfig')
certsdir = windowsify(u'certs')
localcertsdir = windowsify(u'localcerts')
if len(profile) > 0: if len(profile) > 0:
conffile += '.' + profile conffile += '.' + profile
pidfile += '.' + profile pidfile += '.' + profile
secretsfile += '.' + profile secretsfile += '.' + profile
pluginsconfdir += '.' + profile pluginsconfdir += '.' + profile
certsdir += u'.' + profile
localcertsdir += u'.' + profile
pidfile += '.pid' pidfile += '.pid'
self.add('CONFIG_FILE', TYPE_CONFIG, conffile) self.add('CONFIG_FILE', TYPE_CONFIG, conffile)
self.add('PID_FILE', TYPE_CACHE, pidfile) self.add('PID_FILE', TYPE_CACHE, pidfile)
self.add('SECRETS_FILE', TYPE_DATA, secretsfile) self.add('SECRETS_FILE', TYPE_DATA, secretsfile)
self.add('PLUGINS_CONFIG_DIR', TYPE_CONFIG, pluginsconfdir) self.add('PLUGINS_CONFIG_DIR', TYPE_CONFIG, pluginsconfdir)
self.add('MY_PEER_CERTS', TYPE_DATA, certsdir)
self.add('MY_CERT', TYPE_CONFIG, localcertsdir)
gajimpaths = ConfigPaths() gajimpaths = ConfigPaths()