From 4405f317e8a4b6a7f2cad59468c5db0e5424cc38 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Mon, 4 Nov 2019 13:08:22 +0300 Subject: [PATCH] release 1 --- project/settings/base.py | 22 ++++++------ project/settings/development.py | 16 ++++----- project/settings/production.py | 59 ++++++++++++++++++++++++++++++++- 3 files changed, 77 insertions(+), 20 deletions(-) diff --git a/project/settings/base.py b/project/settings/base.py index f4a7e9e9..7b323029 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -74,7 +74,7 @@ PROJECT_APPS = [ 'comment.apps.CommentConfig', 'favorites.apps.FavoritesConfig', 'rating.apps.RatingConfig', - 'transfer.apps.TransferConfig', + # 'transfer.apps.TransferConfig', 'tag.apps.TagConfig', 'product.apps.ProductConfig', ] @@ -157,16 +157,16 @@ DATABASES = { 'HOST': os.environ.get('DB_HOSTNAME'), 'PORT': os.environ.get('DB_PORT'), }, - 'legacy': { - 'ENGINE': 'django.db.backends.mysql', - # 'HOST': '172.17.0.1', - # 'HOST': '172.23.0.1', - 'HOST': 'mysql_db', - 'PORT': 3306, - 'NAME': 'dev', - 'USER': 'dev', - 'PASSWORD': 'octosecret123' - } + # 'legacy': { + # 'ENGINE': 'django.db.backends.mysql', + # # 'HOST': '172.17.0.1', + # # 'HOST': '172.23.0.1', + # 'HOST': 'mysql_db', + # 'PORT': 3306, + # 'NAME': 'dev', + # 'USER': 'dev', + # 'PASSWORD': 'octosecret123' + # } } diff --git a/project/settings/development.py b/project/settings/development.py index 2bd96705..7f839bb8 100644 --- a/project/settings/development.py +++ b/project/settings/development.py @@ -54,14 +54,14 @@ DATABASES = { 'HOST': os.environ.get('DB_HOSTNAME'), 'PORT': os.environ.get('DB_PORT'), }, - 'legacy': { - 'ENGINE': 'django.db.backends.mysql', - 'HOST': os.environ.get('MYSQL_HOSTNAME'), - 'PORT': os.environ.get('MYSQL_PORT'), - 'NAME': os.environ.get('MYSQL_DATABASE'), - 'USER': os.environ.get('MYSQL_USER'), - 'PASSWORD': os.environ.get('MYSQL_PASSWORD') - } + # 'legacy': { + # 'ENGINE': 'django.db.backends.mysql', + # 'HOST': os.environ.get('MYSQL_HOSTNAME'), + # 'PORT': os.environ.get('MYSQL_PORT'), + # 'NAME': os.environ.get('MYSQL_DATABASE'), + # 'USER': os.environ.get('MYSQL_USER'), + # 'PASSWORD': os.environ.get('MYSQL_PASSWORD') + # } } BROKER_URL = 'redis://localhost:6379/1' diff --git a/project/settings/production.py b/project/settings/production.py index b7ddc401..f72a8869 100644 --- a/project/settings/production.py +++ b/project/settings/production.py @@ -1,10 +1,67 @@ """Production settings.""" from .base import * from .amazon_s3 import * +import sentry_sdk +from sentry_sdk.integrations.django import DjangoIntegration + +ALLOWED_HOSTS = ['*.next.gaultmillau.com', 'api.gaultmillau.com'] + +CSRF_TRUSTED_ORIGINS = ['.next.gaultmillau.com', ] + +SEND_SMS = False +SMS_CODE_SHOW = True +USE_CELERY = True + +SCHEMA_URI = 'http' +DEFAULT_SUBDOMAIN = 'www' +SITE_DOMAIN_URI = 'gaultmillau.com' +DOMAIN_URI = 'next.gaultmillau.com' + + +# ELASTICSEARCH SETTINGS +ELASTICSEARCH_DSL = { + 'default': { + 'hosts': 'localhost:9200' + } +} + + +ELASTICSEARCH_INDEX_NAMES = { + 'search_indexes.documents.news': 'development_news', # temporarily disabled + 'search_indexes.documents.establishment': 'development_establishment', +} + + +sentry_sdk.init( + dsn="https://35d9bb789677410ab84a822831c6314f@sentry.io/1729093", + integrations=[DjangoIntegration()] +) + +# TMP ( TODO remove it later) +# Временный хардкод для демонстрации 4 ноября, потом удалить! +HARDCODED_INTERNATIONAL_NEWS_IDS = [8, 9, 10, 11, 15, 17] + +# Database +# https://docs.djangoproject.com/en/2.2/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.contrib.gis.db.backends.postgis', + 'NAME': os.environ.get('DB_NAME'), + 'USER': os.environ.get('DB_USERNAME'), + 'PASSWORD': os.environ.get('DB_PASSWORD'), + 'HOST': os.environ.get('DB_HOSTNAME'), + 'PORT': os.environ.get('DB_PORT'), + }, +} + +BROKER_URL = 'redis://localhost:6379/1' +CELERY_RESULT_BACKEND = BROKER_URL +CELERY_BROKER_URL = BROKER_URL # Booking API configuration GUESTONLINE_SERVICE = 'https://api.guestonline.fr/' GUESTONLINE_TOKEN = '' LASTABLE_SERVICE = '' LASTABLE_TOKEN = '' -LASTABLE_PROXY = '' +LASTABLE_PROXY = '' \ No newline at end of file