Update to 8.17
Sentry.conf.py is pulled from https://github.com/getsentry/docker-sentry/tree/master/8.17
This commit is contained in:
		
				
					committed by
					
						
						Matt Robenolt
					
				
			
			
				
	
			
			
			
						parent
						
							4483d7fc9c
						
					
				
				
					commit
					f7dcf7f7f3
				
			@@ -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 ''
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user