From f7dcf7f7f39fa0797484f6f37fd21769b6699dc8 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Thu, 29 Jun 2017 16:13:18 -0400 Subject: [PATCH] Update to 8.17 Sentry.conf.py is pulled from https://github.com/getsentry/docker-sentry/tree/master/8.17 --- sentry.conf.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sentry.conf.py b/sentry.conf.py index 9176307..e4e0baf 100644 --- a/sentry.conf.py +++ b/sentry.conf.py @@ -34,13 +34,11 @@ # BITBUCKET_CONSUMER_KEY # BITBUCKET_CONSUMER_SECRET from sentry.conf.server import * # NOQA -from sentry.utils.types import Bool import os import os.path CONF_ROOT = os.path.dirname(__file__) -env = os.environ.get postgres = env('SENTRY_POSTGRES_HOST') or (env('POSTGRES_PORT_5432_TCP_ADDR') and 'postgres') if postgres: @@ -86,7 +84,7 @@ SENTRY_USE_BIG_INTS = True # Instruct Sentry that this install intends to be run by a single organization # and thus various UI optimizations should be enabled. -SENTRY_SINGLE_ORGANIZATION = Bool(env('SENTRY_SINGLE_ORGANIZATION', True)) +SENTRY_SINGLE_ORGANIZATION = env('SENTRY_SINGLE_ORGANIZATION', True) ######### # Redis # @@ -237,7 +235,7 @@ SENTRY_OPTIONS['filestore.options'] = { # If you're using a reverse SSL proxy, you should enable the X-Forwarded-Proto # header and set `SENTRY_USE_SSL=1` -if Bool(env('SENTRY_USE_SSL', False)): +if env('SENTRY_USE_SSL', False): SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') SESSION_COOKIE_SECURE = True CSRF_COOKIE_SECURE = True @@ -261,7 +259,7 @@ if email: SENTRY_OPTIONS['mail.password'] = env('SENTRY_EMAIL_PASSWORD') or '' SENTRY_OPTIONS['mail.username'] = env('SENTRY_EMAIL_USER') or '' SENTRY_OPTIONS['mail.port'] = int(env('SENTRY_EMAIL_PORT') or 25) - SENTRY_OPTIONS['mail.use-tls'] = Bool(env('SENTRY_EMAIL_USE_TLS', False)) + SENTRY_OPTIONS['mail.use-tls'] = env('SENTRY_EMAIL_USE_TLS', False) else: SENTRY_OPTIONS['mail.backend'] = 'dummy' @@ -276,7 +274,7 @@ SENTRY_OPTIONS['mail.mailgun-api-key'] = env('SENTRY_MAILGUN_API_KEY') or '' if SENTRY_OPTIONS['mail.mailgun-api-key']: SENTRY_OPTIONS['mail.enable-replies'] = True else: - SENTRY_OPTIONS['mail.enable-replies'] = Bool(env('SENTRY_ENABLE_EMAIL_REPLIES', False)) + SENTRY_OPTIONS['mail.enable-replies'] = env('SENTRY_ENABLE_EMAIL_REPLIES', False) if SENTRY_OPTIONS['mail.enable-replies']: SENTRY_OPTIONS['mail.reply-hostname'] = env('SENTRY_SMTP_HOSTNAME') or ''