From 79576797b0b7e10403917fe1066132193c692b06 Mon Sep 17 00:00:00 2001 From: Aditya Bansal Date: Fri, 3 Nov 2017 00:18:29 +0530 Subject: [PATCH] thumbor: Auto generate thumbor_key and add it to zulip settings. --- scripts/setup/generate_secrets.py | 1 + version.py | 2 +- zproject/settings.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/setup/generate_secrets.py b/scripts/setup/generate_secrets.py index 4e5a84a0d8..b85f0bb744 100755 --- a/scripts/setup/generate_secrets.py +++ b/scripts/setup/generate_secrets.py @@ -30,6 +30,7 @@ AUTOGENERATED_SETTINGS = [ 'local_database_password', 'rabbitmq_password', 'shared_secret', + 'thumbor_key', ] # TODO: We can eliminate this function if we refactor the install diff --git a/version.py b/version.py index 091730709e..eb67416417 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ ZULIP_VERSION = "1.7.0+git" -PROVISION_VERSION = '11.3' +PROVISION_VERSION = '11.4' diff --git a/zproject/settings.py b/zproject/settings.py index a1913ca155..5d710608b5 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -1484,3 +1484,5 @@ CROSS_REALM_BOT_EMAILS = { } CONTRIBUTORS_DATA = os.path.join(STATIC_ROOT, 'generated/github-contributors.json') + +THUMBOR_KEY = get_secret('thumbor_key')