heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[620] Allow for multiple mediagoblin configs to be set in config.ini, use first

Browse Source 
This way we can copy paste.ini into paste_local.ini but not have to
update it to find mediagoblin_local.ini.
This commit is contained in:
Christopher Allan Webber 2011-10-29 17:04:19 -05:00
parent 9d0a613be9
commit 91903aa601
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/app.py
View File

@ -178,6 +178,16 @@ class MediaGoblinApp(object):
def paste_app_factory(global_config, **app_config): 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 return mgoblin_app

2
paste.ini
View File

@ -14,7 +14,7 @@ use = egg:Paste#urlmap
[app:mediagoblin] [app:mediagoblin]
use = egg:mediagoblin#app use = egg:mediagoblin#app
filter-with = beaker filter-with = beaker
config = %(here)s/mediagoblin.ini config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
[app:publicstore_serve] [app:publicstore_serve]
use = egg:Paste#static use = egg:Paste#static