From 75eb53c13f8d0f6e68fc48bc9b34b98e30b21a8e Mon Sep 17 00:00:00 2001 From: Intevation Common Account Date: Mon, 7 Aug 2023 17:18:37 +0200 Subject: [PATCH] Update search service env --- pkg/config/default-config.yml | 13 +++---------- pkg/setup/setup_test.go | 11 +++-------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/pkg/config/default-config.yml b/pkg/config/default-config.yml index b1e79d3..dfcde26 100644 --- a/pkg/config/default-config.yml +++ b/pkg/config/default-config.yml @@ -36,16 +36,9 @@ defaultEnvironment: AUTH_HOST: auth AUTH_PORT: 9004 - SECRETS_PATH: /run/secrets - - OPENSLIDES_DB_HOST: postgres - OPENSLIDES_DB_USER: openslides - OPENSLIDES_DB_PASSWORD: secret:postgres_password - OPENSLIDES_DB: openslides - - SEARCH_SERVICE_HOST: search - OPENSLIDES_SEARCH_PORT: 9050 - OPENSLIDES_RESTRICTER: http://autoupdate:9012/internal/autoupdate/restrict_fqids + SEARCH_HOST: search + SEARCH_PORT: 9050 + RESTRICTER_URL: http://autoupdate:9012/internal/autoupdate VOTE_HOST: vote VOTE_PORT: 9013 diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go index 12b24e9..433f94f 100644 --- a/pkg/setup/setup_test.go +++ b/pkg/setup/setup_test.go @@ -501,18 +501,13 @@ x-default-environment: &default-environment MEDIA_PORT: "9006" MESSAGE_BUS_HOST: redis MESSAGE_BUS_PORT: "6379" - OPENSLIDES_DB: openslides - OPENSLIDES_DB_HOST: postgres - OPENSLIDES_DB_PASSWORD: secret:postgres_password - OPENSLIDES_DB_USER: openslides OPENSLIDES_DEVELOPMENT: "false" OPENSLIDES_LOGLEVEL: info - OPENSLIDES_RESTRICTER: http://autoupdate:9012/internal/autoupdate/restrict_fqids - OPENSLIDES_SEARCH_PORT: "9050" PRESENTER_HOST: backendPresenter PRESENTER_PORT: "9003" - SEARCH_SERVICE_HOST: search - SECRETS_PATH: /run/secrets + RESTRICTER_URL: http://autoupdate:9012/internal/autoupdate + SEARCH_HOST: search + SEARCH_PORT: "9050" SUPERADMIN_PASSWORD_FILE: /run/secrets/superadmin SYSTEM_URL: localhost:8000 VOTE_DATABASE_HOST: postgres