From 018f4d600dd8a220fe2ac0f275fcedbbfad14544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20=C5=A0korpil?= Date: Thu, 19 Jan 2023 17:44:27 +0100 Subject: [PATCH] Added basic authentication and cors config to storage app --- .env.dist | 3 +++ docker-compose.traefik.yml | 4 ++-- docker-compose.yml | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.env.dist b/.env.dist index 29a9b6a..c7bdf8c 100644 --- a/.env.dist +++ b/.env.dist @@ -13,3 +13,6 @@ FEDISEARCH_ELASTIC_PASSWORD= FEDISEARCH_BANNED_DOMAINS= FEDISEARCH_MAX_CRAWLING_DEPTH= FEDISEARCH_CRAWLING_VERSION=0 +FEDISEARCH_KEY_ADMIN= +FEDISEARCH_KEY_CRAWLER= +FEDISEARCH_CORS_ALLOWED_ORIGINS=* diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml index 5eec35f..55efd55 100644 --- a/docker-compose.traefik.yml +++ b/docker-compose.traefik.yml @@ -5,8 +5,8 @@ services: proxy: labels: - "traefik.enable=true" - - "traefik.http.routers.fedisearch-searcher.rule=Host(`${FEDISEARCH_DOMAIN}`)&Path(`/api/graphql`)" - - "traefik.http.services.fedisearch-searcher.loadbalancer.server.port=3000" + - "traefik.http.routers.fedisearch-storage.rule=Host(`${FEDISEARCH_DOMAIN}`)&&Path(`/api/graphql`)" + - "traefik.http.services.fedisearch-storage.ladbalancer.server.port=3000" fedisearch-searcher: networks: proxy: diff --git a/docker-compose.yml b/docker-compose.yml index 7283118..2628ebc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,8 @@ services: environment: - 'ELASTIC_URL=http://elastic:9200' - 'ELASTIC_PASSWORD=${FEDISEARCH_ELASTIC_PASSWORD}' + - 'ACCESS_WRITE=${FEDISEARCH_KEY_CRAWLER},${FEDISEARCH_KEY_ADMIN}' + - 'CORS_ALLOWED_ORIGINS=${FEDISEARCH_CORS_ALLOWED_ORIGINS}' networks: fedisearch: logging: *default-logging @@ -40,6 +42,7 @@ services: - 'BANNED_DOMAINS=${FEDISEARCH_BANNED_DOMAINS}' - 'MAX_CRAWLING_DEPTH=${FEDISEARCH_MAX_CRAWLING_DEPTH}' - 'CRAWLING_VERSION=${FEDISEARCH_CRAWLING_VERSION}' + - 'STORE_KEY=${FEDISEARCH_KEY_CRAWLER}' networks: fedisearch: logging: *default-logging