From 498e9bb216158bc9b13b795fc427a6d05ce286c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20=C5=A0korpil?= Date: Tue, 25 Jul 2023 16:29:55 +0200 Subject: [PATCH] Reconfigure project to use local dev enviroment with https using custom CA --- .env.dist | 2 +- docker-compose.dev.yml | 32 +++++++++++++------------------- docker-compose.traefik.yml | 14 +++++++++++--- docker-compose.yml | 1 + 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.env.dist b/.env.dist index c7bdf8c..3669976 100644 --- a/.env.dist +++ b/.env.dist @@ -1,4 +1,4 @@ -FEDISEARCH_DOMAIN= +FEDISEARCH_DOMAIN=fedisearch.localhost FEDISEARCH_SEED='mastodon.social' FEDISEARCH_MATOMO_URL= FEDISEARCH_MATOMO_SITE_ID= diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index ae388da..9e398bb 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,17 +1,20 @@ version: "3.9" services: fedisearch-elasticsearch: - environment: - - xpack.security.enrollment.enabled=true - ports: - - 9200:9200 - + labels: + - "traefik.enable=true" + - "traefik.http.routers.fedisearch-elastic.rule=Host(`elastic.${FEDISEARCH_DOMAIN}`)" + - "traefik.http.routers.fedisearch-elastic.entrypoints=https" + - "traefik.http.routers.fedisearch-elastic.tls=true" + - "traefik.http.routers.fedisearch-elastic.tls.certresolver=local" + - "traefik.http.routers.fedisearch-elastic.tls.domains[0].main=elastic.${FEDISEARCH_DOMAIN}" + - "traefik.http.services.fedisearch-elasticsearch.loadbalancer.server.port=9200" fedisearch-storage: image: skorpil/fedistore:dev build: target: dev - ports: - - 4000:3000 + labels: + - "traefik.http.routers.fedisearch-storage.tls.certresolver=local" volumes: - ./build/fedistore/application:/srv @@ -26,17 +29,8 @@ services: image: skorpil/fedisearch:dev build: target: dev - ports: - - 3000:3000 + labels: + - "traefik.http.routers.fedisearch-searcher.tls.certresolver=local" volumes: - ./build/fedisearch/application:/srv -# fedisearch-kibana: -# image: kibana:8.4.1 -# environment: -# ELASTICSEARCH_HOSTS: '["http://elastic:${FEDISEARCH_ELASTIC_PASSWORD}@fedisearch-elasticsearch:9200"]' -# networks: -# fedisearch: -# aliases: -# - kibana -# ports: -# - 5601:5601 + diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml index 55efd55..517b76e 100644 --- a/docker-compose.traefik.yml +++ b/docker-compose.traefik.yml @@ -4,15 +4,23 @@ services: networks: proxy: labels: - - "traefik.enable=true" - - "traefik.http.routers.fedisearch-storage.rule=Host(`${FEDISEARCH_DOMAIN}`)&&Path(`/api/graphql`)" - - "traefik.http.services.fedisearch-storage.ladbalancer.server.port=3000" + - "traefik.enable=true" + - "traefik.http.routers.fedisearch-storage.rule=Host(`${FEDISEARCH_DOMAIN}`)&&Path(`/api/graphql`)" + - "traefik.http.routers.fedisearch-storage.entrypoints=https" + - "traefik.http.routers.fedisearch-storage.tls=true" + - "traefik.http.routers.fedisearch-storage.tls.certresolver=letsencrypt" + - "traefik.http.routers.fedisearch-storage.tls.domains[0].main=${FEDISEARCH_DOMAIN}" + - "traefik.http.services.fedisearch-storage.loadbalancer.server.port=3000" fedisearch-searcher: networks: proxy: labels: - "traefik.enable=true" - "traefik.http.routers.fedisearch-searcher.rule=Host(`${FEDISEARCH_DOMAIN}`)" + - "traefik.http.routers.fedisearch-searcher.entrypoints=https" + - "traefik.http.routers.fedisearch-searcher.tls=true" + - "traefik.http.routers.fedisearch-searcher.tls.certresolver=letsencrypt" + - "traefik.http.routers.fedisearch-searcher.tls.domains[0].main=${FEDISEARCH_DOMAIN}" - "traefik.http.services.fedisearch-searcher.loadbalancer.server.port=3000" networks: diff --git a/docker-compose.yml b/docker-compose.yml index 2628ebc..43c6d44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,6 +70,7 @@ services: image: elasticsearch:8.4.1 restart: always environment: + - xpack.security.enrollment.enabled=true - discovery.type=single-node - ELASTIC_PASSWORD=${FEDISEARCH_ELASTIC_PASSWORD} - 'TZ=${FEDISEARCH_TIMEZONE}'