From 8ba25960e7a38dc4356f9db2ac641b024330526d Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 9 Jun 2020 20:36:01 -0700 Subject: [PATCH] settings: Move NAGIOS_BOT_HOST default to default_settings. Signed-off-by: Anders Kaseorg --- zproject/default_settings.py | 3 +++ zproject/settings.py | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zproject/default_settings.py b/zproject/default_settings.py index 4d9704545b..c24639e641 100644 --- a/zproject/default_settings.py +++ b/zproject/default_settings.py @@ -399,3 +399,6 @@ GOOGLE_ANALYTICS_ID: Optional[str] = None # This is overridden by dev_settings.py for droplets. IS_DEV_DROPLET = False + +# Used by puppet/zulip_ops/files/cron.d/check_send_receive_time. +NAGIOS_BOT_HOST = EXTERNAL_HOST diff --git a/zproject/settings.py b/zproject/settings.py index 78ecaa10d7..06d07370d7 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -427,9 +427,6 @@ else: ROOT_DOMAIN_URI = EXTERNAL_URI_SCHEME + EXTERNAL_HOST -if "NAGIOS_BOT_HOST" not in vars(): - NAGIOS_BOT_HOST = EXTERNAL_HOST - S3_KEY = get_secret("s3_key") S3_SECRET_KEY = get_secret("s3_secret_key")