From 5c9bcc5c23eb64cc0e96eedbd126037369862fc5 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Thu, 2 Jul 2015 12:50:03 -0700 Subject: [PATCH] Ensuring that we are looking for LEMUR_ENCRYPTION_KEY configuration variable and not ENCRYPTION_KEY configuration variable. --- lemur/factory.py | 4 ++-- lemur/manage.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 lemur/manage.py diff --git a/lemur/factory.py b/lemur/factory.py index 520ee977..42afb32d 100644 --- a/lemur/factory.py +++ b/lemur/factory.py @@ -84,14 +84,14 @@ def configure_app(app, config=None): :return: """ try: - app.config.from_envvar("LEMUR_SETTINGS") + app.config.from_envvar("LEMUR_CONF") except RuntimeError: if config and config != 'None': app.config.from_object(from_file(config)) else: 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 diff --git a/lemur/manage.py b/lemur/manage.py old mode 100644 new mode 100755 index 4c54ebe4..5afa71c8 --- a/lemur/manage.py +++ b/lemur/manage.py @@ -494,7 +494,7 @@ class LemurServer(Command): return app.run() -def main(): +if __name__ == "__main__": manager.add_command("start", LemurServer()) manager.add_command("runserver", Server(host='127.0.0.1')) manager.add_command("clean", Clean())