diff --git a/.env b/.env index 97c63a903..2bad6c2e7 100644 --- a/.env +++ b/.env @@ -147,6 +147,9 @@ PGADMIN_DEFAULT_EMAIL=admin@${PHRASEA_DOMAIN} PGADMIN_DEFAULT_PASSWORD=__CHANGE_ME_eTRPkJOyniPHmZ DB_DEV_PORT=5432 +# Deprecated +AUTH_DB_NAME=auth + DATABOX_DB_NAME=databox EXPOSE_DB_NAME=expose NOTIFY_DB_NAME=notify diff --git a/bin/setup.sh b/bin/setup.sh index 56431f2e1..ccdcf627b 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -108,6 +108,7 @@ COMPOSE_PROFILES="${COMPOSE_PROFILES},setup" docker compose run --rm -T --entryp docker compose restart keycloak docker compose run --rm dockerize -wait http://keycloak:8080 -timeout 200s +docker compose run --rm --entrypoint="" configurator /bin/ash -c env docker compose run --rm configurator configure -vvv echo "Done." diff --git a/configurator/.env b/configurator/.env index 78b6ca0f4..1a2fc1fda 100644 --- a/configurator/.env +++ b/configurator/.env @@ -28,3 +28,5 @@ APP_SECRET=fe5922c9df2f78b897cbf2bf988c7204 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4" DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8" ###< doctrine/doctrine-bundle ### + +VERIFY_SSL=true diff --git a/docker-compose.yml b/docker-compose.yml index 60bdaa634..2a4059f8d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1000,6 +1000,7 @@ services: - POSTGRES_PASSWORD - POSTGRES_HOST=db - POSTGRES_PORT=5432 + - AUTH_DB_NAME - DATABOX_DB_NAME - EXPOSE_DB_NAME - NOTIFY_DB_NAME