diff --git a/apps/main/views/common.py b/apps/main/views/common.py index d890e42b..d509f80e 100644 --- a/apps/main/views/common.py +++ b/apps/main/views/common.py @@ -69,7 +69,7 @@ class CarouselListView(generics.ListAPIView): def get_queryset(self): country_code = self.request.country_code - qs = self.queryset + qs = models.Carousel.objects.is_parsed().active() if country_code: qs = qs.by_country_code(country_code) return qs diff --git a/project/settings/base.py b/project/settings/base.py index d0c12501..686f246e 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 567ec1dd..c6f80f9e 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..4f9e90b7 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': 'elasticsearch: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 diff --git a/requirements/base.txt b/requirements/base.txt index 3a45dedc..a6a007bd 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -42,7 +42,7 @@ django-storages==1.7.2 sorl-thumbnail==12.5.0 -mysqlclient==1.4.4 +# mysqlclient==1.4.4 PyYAML==5.1.2 # temp solution