aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/app.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-10-29 17:04:19 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-10-29 17:04:19 -0500
commit91903aa601813f4ce7ea8259aa8fe2910b576311 (patch)
tree98c3560f75226f9bca1cec604e705f1bb88e5920 /mediagoblin/app.py
parent9d0a613be937b426b8137016f01bb43feed88341 (diff)
downloadmediagoblin-91903aa601813f4ce7ea8259aa8fe2910b576311.tar.lz
mediagoblin-91903aa601813f4ce7ea8259aa8fe2910b576311.tar.xz
mediagoblin-91903aa601813f4ce7ea8259aa8fe2910b576311.zip
[620] Allow for multiple mediagoblin configs to be set in config.ini, use first
This way we can copy paste.ini into paste_local.ini but not have to update it to find mediagoblin_local.ini.
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r--mediagoblin/app.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index ee646282..d39469c3 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -178,6 +178,16 @@ class MediaGoblinApp(object):
def paste_app_factory(global_config, **app_config):
- mgoblin_app = MediaGoblinApp(app_config['config'])
+ configs = app_config['config'].split()
+ mediagoblin_config = None
+ for config in configs:
+ if os.path.exists(config) and os.access(config, os.R_OK):
+ mediagoblin_config = config
+ break
+
+ if not mediagoblin_config:
+ raise IOError("Usable mediagoblin config not found.")
+
+ mgoblin_app = MediaGoblinApp(mediagoblin_config)
return mgoblin_app