phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix configs

Browse Source
This commit is contained in:
Kuroshini 2020-01-22 21:07:01 +03:00
parent bdf5c77f03
commit a9acbf3955
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project/settings/amazon_s3.py
View File

@ -5,9 +5,9 @@ from .base import MEDIA_LOCATION
# AMAZON S3 # AMAZON S3
AWS_S3_REGION_NAME = 'eu-central-1' AWS_S3_REGION_NAME = 'eu-central-1'
AWS_ACCESS_KEY_ID = 'AKIA4T5M5TJWDYT3SB6Y' AWS_ACCESS_KEY_ID = os.getenv('AWS_ACCESS_KEY_ID')
AWS_SECRET_ACCESS_KEY = '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' AWS_SECRET_ACCESS_KEY = os.getenv('AWS_SECRET_ACCESS_KEY')
AWS_STORAGE_BUCKET_NAME = 'gm-test.com' AWS_STORAGE_BUCKET_NAME = os.getenv('AWS_STORAGE_BUCKET_NAME')
AWS_S3_CUSTOM_DOMAIN = f's3.{AWS_S3_REGION_NAME}.amazonaws.com/{AWS_STORAGE_BUCKET_NAME}' AWS_S3_CUSTOM_DOMAIN = f's3.{AWS_S3_REGION_NAME}.amazonaws.com/{AWS_STORAGE_BUCKET_NAME}'
AWS_S3_OBJECT_PARAMETERS = {'CacheControl': 'max-age=86400'} AWS_S3_OBJECT_PARAMETERS = {'CacheControl': 'max-age=86400'}
AWS_S3_ADDRESSING_STYLE = 'path' AWS_S3_ADDRESSING_STYLE = 'path'

42
project/settings/local.py
View File

@ -1,7 +1,7 @@
"""Local settings.""" """Local settings."""
from .base import * from .base import *
import sys import sys
from .amazon_s3 import * # from .amazon_s3 import *
ALLOWED_HOSTS = ['*', ] ALLOWED_HOSTS = ['*', ]
@ -28,7 +28,7 @@ MEDIA_ROOT = os.path.join(PUBLIC_ROOT, MEDIA_LOCATION)
# SORL thumbnails # SORL thumbnails
THUMBNAIL_DEBUG = True THUMBNAIL_DEBUG = True
MIDDLEWARE.append('utils.middleware.log_db_queries_per_API_request')
# DATABASES # DATABASES
DATABASES = { DATABASES = {
@ -43,15 +43,15 @@ DATABASES = {
'options': '-c search_path=gm,public' 'options': '-c search_path=gm,public'
}, },
}, },
# 'legacy': { 'legacy': {
# 'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
# # 'HOST': '172.22.0.1', # 'HOST': '172.22.0.1',
# 'HOST': 'mysql_db', 'HOST': 'mysql_db',
# 'PORT': 3306, 'PORT': 3306,
# 'NAME': 'dev', 'NAME': 'dev',
# 'USER': 'dev', 'USER': 'dev',
# 'PASSWORD': 'octosecret123' 'PASSWORD': 'octosecret123'
# }, },
} }
@ -84,26 +84,26 @@ LOGGING = {
'py.warnings': { 'py.warnings': {
'handlers': ['console'], 'handlers': ['console'],
}, },
'django.db.backends': { # 'django.db.backends': {
'handlers': ['console', ], # 'handlers': ['console', ],
'level': 'DEBUG', # 'level': 'DEBUG',
'propagate': False, # 'propagate': False,
}, # },
} }
} }
# ELASTICSEARCH SETTINGS # ELASTICSEARCH SETTINGS
ELASTICSEARCH_DSL = { ELASTICSEARCH_DSL = {
'default': { 'default': {
'hosts': '188.68.209.124:9200' 'hosts': 'elasticsearch:9200'
} }
} }
ELASTICSEARCH_INDEX_NAMES = { ELASTICSEARCH_INDEX_NAMES = {
'search_indexes.documents.news': 'development_news', # 'search_indexes.documents.news': 'local_news',
'search_indexes.documents.establishment': 'development_establishment', 'search_indexes.documents.establishment': 'local_establishment',
'search_indexes.documents.product': 'development_product', 'search_indexes.documents.product': 'local_product',
'search_indexes.documents.tag_category': 'development_tag_category', 'search_indexes.documents.tag_category': 'local_tag_category',
} }
ELASTICSEARCH_DSL_AUTOSYNC = False ELASTICSEARCH_DSL_AUTOSYNC = False