Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensuring that we are looking for LEMUR_ENCRYPTION_KEY configuration variable and not ENCRYPTION_KEY configuration variable.

This commit is contained in:
kevgliss 2015-07-02 12:50:03 -07:00
parent 4330ac9c05
commit 5c9bcc5c23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lemur/factory.py
View File

@ -84,14 +84,14 @@ def configure_app(app, config=None):
:return: :return:
""" """
try: try:
app.config.from_envvar("LEMUR_SETTINGS") app.config.from_envvar("LEMUR_CONF")
except RuntimeError: except RuntimeError:
if config and config != 'None': if config and config != 'None':
app.config.from_object(from_file(config)) app.config.from_object(from_file(config))
else: else:
app.config.from_object(from_file(os.path.expanduser("~/.lemur/lemur.conf.py"))) app.config.from_object(from_file(os.path.expanduser("~/.lemur/lemur.conf.py")))
if not app.config.get('ENCRYPTION_KEY'): if not app.config.get('LEMUR_ENCRYPTION_KEY'):
raise NoEncryptionKeyFound raise NoEncryptionKeyFound

2
lemur/manage.py Normal file → Executable file
View File

@ -494,7 +494,7 @@ class LemurServer(Command):
return app.run() return app.run()
def main(): if __name__ == "__main__":
manager.add_command("start", LemurServer()) manager.add_command("start", LemurServer())
manager.add_command("runserver", Server(host='127.0.0.1')) manager.add_command("runserver", Server(host='127.0.0.1'))
manager.add_command("clean", Clean()) manager.add_command("clean", Clean())