parent
b1508b13c4
commit
433e8fe921
|
@ -37,7 +37,7 @@ AUTH_PROFILE_MODULE = 'accounts.UserProfile'
|
||||||
AUTHENTICATION_BACKENDS = ('utils.backends.EmailOrUsernameModelBackend',)
|
AUTHENTICATION_BACKENDS = ('utils.backends.EmailOrUsernameModelBackend',)
|
||||||
BASE_PATH = os.path.dirname(__file__)
|
BASE_PATH = os.path.dirname(__file__)
|
||||||
DEBUG = True if 'DEBUG' in os.environ else False
|
DEBUG = True if 'DEBUG' in os.environ else False
|
||||||
DEFAULT_FROM_EMAIL = 'support@snipt.net'
|
DEFAULT_FROM_EMAIL = os.environ.get('POSTMARK_INBOUND_ADDRESS', 'snipt@localhost')
|
||||||
EMAIL_BACKEND = 'postmark.django_backend.EmailBackend'
|
EMAIL_BACKEND = 'postmark.django_backend.EmailBackend'
|
||||||
HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
|
HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
|
||||||
INTERNAL_IPS = ('127.0.0.1',)
|
INTERNAL_IPS = ('127.0.0.1',)
|
||||||
|
@ -65,7 +65,7 @@ ROOT_URLCONF = 'urls'
|
||||||
SECRET_KEY = os.environ.get('SECRET_KEY', 'changeme')
|
SECRET_KEY = os.environ.get('SECRET_KEY', 'changeme')
|
||||||
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
|
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
|
||||||
SEND_BROKEN_LINK_EMAILS = False
|
SEND_BROKEN_LINK_EMAILS = False
|
||||||
SERVER_EMAIL = 'support@snipt.net'
|
SERVER_EMAIL = os.environ.get('POSTMARK_INBOUND_ADDRESS', 'snipt@localhost')
|
||||||
SESSION_COOKIE_AGE = 15801100
|
SESSION_COOKIE_AGE = 15801100
|
||||||
SESSION_COOKIE_SECURE = True if 'USE_SSL' in os.environ else False
|
SESSION_COOKIE_SECURE = True if 'USE_SSL' in os.environ else False
|
||||||
SITE_ID = 1
|
SITE_ID = 1
|
||||||
|
|
|
@ -18,6 +18,9 @@ from snipts.models import Favorite, Snipt, SniptSecureView
|
||||||
from taggit.models import Tag
|
from taggit.models import Tag
|
||||||
from teams.models import Team
|
from teams.models import Team
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
|
|
||||||
RESULTS_PER_PAGE = getattr(settings, 'HAYSTACK_SEARCH_RESULTS_PER_PAGE', 20)
|
RESULTS_PER_PAGE = getattr(settings, 'HAYSTACK_SEARCH_RESULTS_PER_PAGE', 20)
|
||||||
|
|
||||||
|
|
||||||
|
@ -99,7 +102,7 @@ def report_spam(request, snipt_id):
|
||||||
User: https://snipt.net/admin/auth/user/{}/delete/
|
User: https://snipt.net/admin/auth/user/{}/delete/
|
||||||
Reporter: https://snipt.net/{}/
|
Reporter: https://snipt.net/{}/
|
||||||
""".format(snipt.id, snipt.user.id, request.user.username),
|
""".format(snipt.id, snipt.user.id, request.user.username),
|
||||||
'support@snipt.net',
|
os.environ.get('POSTMARK_INBOUND_ADDRESS', 'snipt@localhost'),
|
||||||
['nick@snipt.net'],
|
['nick@snipt.net'],
|
||||||
fail_silently=False)
|
fail_silently=False)
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ def for_teams_complete(request):
|
||||||
Team: https://snipt.net/{}
|
Team: https://snipt.net/{}
|
||||||
Email: {}
|
Email: {}
|
||||||
""".format(team.slug, team.email),
|
""".format(team.slug, team.email),
|
||||||
'support@snipt.net',
|
os.environ.get('POSTMARK_INBOUND_ADDRESS', 'snipt@localhost'),
|
||||||
['nick@snipt.net'],
|
['nick@snipt.net'],
|
||||||
fail_silently=False)
|
fail_silently=False)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue