diff options
| author | luxagraf <sng@luxagraf.net> | 2019-01-09 13:29:17 -0600 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2019-01-09 13:29:17 -0600 |
| commit | be0bb4e123240ac3ce02431b974c82f8f05d843b (patch) | |
| tree | e2da7ac44be955ad5cbf32c0a35dc507ba63e844 /config | |
| parent | d5f430d3e1e2b274d8d8f744251e8b6b4b72ebd9 (diff) | |
latest changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/base_urls.py | 10 | ||||
| -rw-r--r-- | config/settings.py | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/config/base_urls.py b/config/base_urls.py index efbe233..ed4bd91 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -45,12 +45,12 @@ urlpatterns += [ #path(r'<path>/<slug>/', PageDetailView.as_view(), name="pages"), path(r'api-auth/', include('rest_framework.urls', namespace='rest_framework')) ] -if settings.DEBUG: - import debug_toolbar - urlpatterns = [ - path('__debug__/', include(debug_toolbar.urls)), +#if settings.DEBUG: + #import debug_toolbar + #urlpatterns = [ + # path('__debug__/', include(debug_toolbar.urls)), # For django versions before 2.0: # url(r'^__debug__/', include(debug_toolbar.urls)), - ] + urlpatterns + #] + urlpatterns diff --git a/config/settings.py b/config/settings.py index c7bef91..dcd14ee 100644 --- a/config/settings.py +++ b/config/settings.py @@ -24,9 +24,14 @@ DEBUG = config('DEBUG', cast=bool) AUTH_PROFILE_MODULE = "accounts.UserProfile" AUTH_USER_MODEL = "accounts.User" -DEFAULT_FILE_STORAGE = config('DEFAULT_FILE_STORAGE') INTERNAL_IPS = config('INTERNAL_IPS') + +DEFAULT_FILE_STORAGE = config('DEFAULT_FILE_STORAGE') +AWS_ACCESS_KEY_ID = config('AWS_ACCESS_KEY_ID') +AWS_SECRET_ACCESS_KEY = config('AWS_SECRET_ACCESS_KEY') +AWS_STORAGE_BUCKET_NAME = config('AWS_STORAGE_BUCKET_NAME') +AWS_DEFAULT_ACL = config('AWS_DEFAULT_ACL') AWS_S3_OBJECT_PARAMETERS = { 'CacheControl': 'max-age=86400', } @@ -65,7 +70,7 @@ THIRD_PARTY_APPS = [ 'taggit_serializer', 'django_extensions', 'rest_framework', - 'debug_toolbar' + #'debug_toolbar' ] LOCAL_APPS = [ 'utils', @@ -82,7 +87,7 @@ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', - 'debug_toolbar.middleware.DebugToolbarMiddleware', + #'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', |