Merge main into stable/4.0.x. Update 20231206

* commit '4c394b440b830ce03c6c743bc1fb41fdda9983ea': Remove `SYSTEM_URL` (#234)
OpenSlides · Dec 6, 2023 · 45ea91d · 45ea91d
2 parents 7042379 + 4c394b4
commit 45ea91d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/pkg/config/default-config.yml b/pkg/config/default-config.yml
@@ -81,7 +81,6 @@ defaultEnvironment:
 
   OPENSLIDES_LOGLEVEL: info
   OPENSLIDES_DEVELOPMENT: "false"
-  SYSTEM_URL: localhost:8000
 
 # You can extend or replace parts of the defaultEnvironment.
 #

diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
@@ -509,7 +509,6 @@ x-default-environment: &default-environment
   SEARCH_HOST: search
   SEARCH_PORT: "9050"
   SUPERADMIN_PASSWORD_FILE: /run/secrets/superadmin
-  SYSTEM_URL: localhost:8000
   VOTE_DATABASE_HOST: postgres
   VOTE_DATABASE_NAME: openslides
   VOTE_DATABASE_PASSWORD_FILE: /run/secrets/postgres_password