From 8369d9e350f5eb23805e27030056abfa9f3eca03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20=C5=A0korpil?= <stepan@skorpil.cz>
Date: Tue, 3 Jan 2023 21:11:02 +0100
Subject: [PATCH] Description fixes

---
 README.md                  | 11 ++++++-----
 docker-compose.traefik.yml |  2 +-
 docker-compose.yml         |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 4af5e6d..dd9e381 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,11 @@
 
 This an example setup for Fediverse feed crawler and searcher.
 
-Fedisearch consists of 3 app containers:
+Fedisearch consists of 4 app containers:
 1. **Elasticsearch** - Key value storage database and fulltext search engine
-2. **Fedicrawl** - crawls through the Fediverse network and stores all found nodes and also its feeds to database
-3. **Fedisearch** - web frontend for searching data in database
+2. **Fedistore** - Provides graphql api for searching and manimpulating with elastic storages
+3. **Fedicrawl** - Crawls through the Fediverse network and stores all found nodes and also its feeds to database
+4. **Fedisearch** - Web frontend for searching data in database
 
 ## Installation
 App is designed primarily to be run in docker on linux. 
@@ -14,7 +15,7 @@ Thus `docker` and `docker-compose` are mandatory dependencies for this example s
 I don't have prebuilt images in docker hub ready yet (but it's planned), so you have to build them locally. 
 Docker compose should build images for you from sources...
 
-1. Clone [fedisearch](https://github.com/Stopka/fedisearch) and [fedicrawl](https://github.com/Stopka/fedicrawl) apps to `./build` directory.
+1. Clone [fedisearch](https://github.com/Stopka/fedisearch), [fedicrawl](https://github.com/Stopka/fedicrawl) and [fedistore](https://github.com/Stopka/fedistore) apps to `./build` directory.
 2. Copy `.env.dist` to `.env` and edit it as needed.
 3. Create an `docker-compose.override.yml` file and override configuration by your liking.
 You should at least add proxy (simple example is in `docker-compose.traefik.yml`) with tls termination.
@@ -26,4 +27,4 @@ All configuration is done by env vars.
 Just edit `.env` file. 
 
 Meaning of variables can be found in the readme files of
-[fedisearch](https://github.com/Stopka/fedisearch) and [fedicrawl](https://github.com/Stopka/fedicrawl) apps.
+[fedisearch](https://github.com/Stopka/fedisearch), [fedicrawl](https://github.com/Stopka/fedicrawl)and [fedistore](https://github.com/Stopka/fedistore) apps.
diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml
index 12623a7..5eec35f 100644
--- a/docker-compose.traefik.yml
+++ b/docker-compose.traefik.yml
@@ -6,7 +6,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.fedisearch-searcher.rule=Host(`${FEDISEARCH_DOMAIN}`)&Path(`/api/graphql`)"
-      - "traefik.http.services.fedisearch-searcher.loadbalancer.server.port=4000"
+      - "traefik.http.services.fedisearch-searcher.loadbalancer.server.port=3000"
   fedisearch-searcher:
     networks:
       proxy:
diff --git a/docker-compose.yml b/docker-compose.yml
index c2db78d..7283118 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,8 +57,7 @@ services:
       - 'MATOMO_SITE_ID=${FEDISEARCH_MATOMO_SITE_ID}'
       - 'STATS_CACHE_MINUTES=${FEDISEARCH_STATS_CACHE_MINUTES}'
       - 'TZ=${FEDISEARCH_TIMEZONE}'
-      - 'ELASTIC_URL=http://elastic:9200'
-      - 'ELASTIC_PASSWORD=${FEDISEARCH_ELASTIC_PASSWORD}'
+      - 'GRAPHQL_URL=http://localhost:4000/api/graphql'
     networks:
       fedisearch:
     logging: *default-logging
@@ -66,6 +65,7 @@ services:
       - fedisearch-storage
   fedisearch-elasticsearch:
     image: elasticsearch:8.4.1
+    restart: always
     environment:
       - discovery.type=single-node
       - ELASTIC_PASSWORD=${FEDISEARCH_ELASTIC_PASSWORD}