From f81e879ae45b80b73d3e47856a7a068c83b26dd2 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Mon, 18 Nov 2019 18:03:21 +0300 Subject: [PATCH] Revert "ES as separate server" This reverts commit 3536be8 --- docker-compose.elasticsearch.yml | 21 --------------------- project/settings/development.py | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 docker-compose.elasticsearch.yml diff --git a/docker-compose.elasticsearch.yml b/docker-compose.elasticsearch.yml deleted file mode 100644 index 3b412ab1..00000000 --- a/docker-compose.elasticsearch.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: '3.5' -services: - elasticsearch: - image: elasticsearch:7.3.1 - volumes: - - gm-esdata:/usr/share/elasticsearch/data - hostname: elasticsearch - network_mode: 'host' - environment: - - "ES_JAVA_OPTS=-Xms4g -Xmx4g" - - discovery.type=single-node - - xpack.security.enabled=false - restart: always - ulimits: - memlock: - soft: -1 - hard: -1 - nofile: - soft: 65536 - hard: 65536 - mem_limit: 4g \ No newline at end of file diff --git a/project/settings/development.py b/project/settings/development.py index 669bc485..3bc258a1 100644 --- a/project/settings/development.py +++ b/project/settings/development.py @@ -21,7 +21,7 @@ DOMAIN_URI = 'gm.id-east.ru' # ELASTICSEARCH SETTINGS ELASTICSEARCH_DSL = { 'default': { - 'hosts': '188.68.209.124:9200' + 'hosts': 'localhost:9200' # 'hosts': 'elasticsearch:9200' } }