summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorIsis Lovecruft <isis@torproject.org>2013-02-17 00:03:58 +0000
committerIsis Lovecruft <isis@torproject.org>2013-02-17 00:03:58 +0000
commit340392e50b04d2c795e6d84d632590b26188feee (patch)
treefe5fee75b1a6cffd13b6ded9731ed1febfa9970a /src/leap
parent1bf1763e5fed2e886d3f9cc26c0198f0b890dd50 (diff)
Add update mechanism to config files to allow new default configs to be pushed
to the git repo later without breaking past versions.
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/mx/util/config.py51
1 files changed, 36 insertions, 15 deletions
diff --git a/src/leap/mx/util/config.py b/src/leap/mx/util/config.py
index e5db591..f655ca9 100644
--- a/src/leap/mx/util/config.py
+++ b/src/leap/mx/util/config.py
@@ -38,9 +38,11 @@ from leap.mx.util import version, storage
from leap.mx.exceptions import MissingConfig, UnsupportedOS
-filename = None
-basic = storage.Storage()
-advanced = storage.Storage()
+filename = None
+config_version = None
+basic = storage.Storage()
+couch = storage.Storage()
+advanced = storage.Storage()
PLATFORMS = {'LINUX': sys.platform.startswith("linux"),
'OPENBSD': sys.platform.startswith("openbsd"),
@@ -69,7 +71,9 @@ def getClientPlatform(platform_name=None):
def _create_config_file(conffile):
"""
- xxx fill me in
+ Create the config file if it doesn't exist.
+
+ @param conffile: The full path to the config file to write to.
"""
with open(conffile, 'w+') as conf:
conf.write("""
@@ -89,6 +93,15 @@ basic:
logfile: mx.log
# Where is the spoolfile of messages to encrypt?:
spoolfile: /var/mail/encrypt_me
+couch:
+ # The couch username for authentication to a CouchDB instance:
+ user: admin
+ # The couch username's password:
+ passwd: passwd
+ # The CouchDB hostname or IP address to connect to:
+ host: couchdb.example.com
+ # The CouchDB port to connect to:
+ port: 7001
advanced:
# Which port on localhost should postfix send check_recipient queries to?:
check_recipient_access_port: 1347
@@ -98,10 +111,10 @@ advanced:
debug: True
# Print enough things really fast to make you look super 1337:
noisy: False
+config_version: 0.0.2
""")
conf.flush()
-
assert ospath.isfile(conffile), "Config file %s not created!" % conffile
def _get_config_location(config_filename=None,
@@ -168,26 +181,34 @@ def loadConfig(file=None):
if ospath.isfile(file):
with open(file, 'a+') as conf:
config_contents = '\n'.join(conf.readlines())
- configuration = yaml.safe_load(config_contents)
+ cfg = yaml.safe_load(config_contents)
## These become objects with their keys loaded as attributes:
##
## from leap.util import config
## config.basic.foo = bar
##
- try:
- for k, v in configuration['basic'].items():
+ try:
+ for k, v in cfg['basic'].items():
basic[k] = v
- except AttributeError:
- pass
+ except (AttributeError, KeyError): pass
- try:
- for k, v in configuration['advanced'].items():
+ try:
+ for k, v in cfg['advanced'].items():
advanced[k] = v
- except AttributeError:
- pass
+ except (AttributeError, KeyError): pass
+
+ try:
+ for k, v in cfg['couch'].items():
+ couch[k] = v
+ except (AttributeError, KeyError): pass
+
+ if 'config_version' in cfg:
+ config_version = cfg['config_version']
+ else:
+ config_version = 'unknown'
- return basic, advanced
+ return basic, couch, advanced, config_version
else:
raise MissingConfig("Could not load config file.")