From 75a6b6d2f70d69d1e6fe0c8f68de3db59628edd5 Mon Sep 17 00:00:00 2001 From: darta Date: Tue, 4 Jan 2022 10:33:18 +0100 Subject: [PATCH] chore(cfg): allows to start haproxy without opened ports behind another proxy --- dd-ctl | 8 +++++++- digitaldemocratic.conf.sample | 2 ++ isard-sso | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dd-ctl b/dd-ctl index e0e9379..99b6d52 100755 --- a/dd-ctl +++ b/dd-ctl @@ -64,10 +64,16 @@ build_compose(){ cp custom/login/background.png custom/system/keycloak/themes/liiibrelite/login/resources/img/loginBG2.png cp custom/login/style.css custom/system/keycloak/themes/liiibrelite/login/resources/css/ + if [ "$BEHIND_PROXY" = "true" ]; then + BEHIND="haproxy-behind.yml" + else + BEHIND="haproxy.yml" + fi + # Build compose ymls echo CUSTOM_PATH=$CUSTOM_PATH > .env echo BUILD_ROOT_PATH=$CUSTOM_PATH/isard-sso >> .env - docker-compose -f isard-sso/docker-compose-parts/haproxy.yml \ + docker-compose -f isard-sso/docker-compose-parts/$BEHIND \ -f isard-sso/docker-compose-parts/api.yml \ -f isard-sso/docker-compose-parts/keycloak.yml \ -f isard-sso/docker-compose-parts/avatars.yml \ diff --git a/digitaldemocratic.conf.sample b/digitaldemocratic.conf.sample index 7e74540..40ed8c9 100644 --- a/digitaldemocratic.conf.sample +++ b/digitaldemocratic.conf.sample @@ -102,6 +102,8 @@ MARIADB_PASSWORD=SuperSecret ##============================================================================= IPA_ADMIN_PWD=freeipafreeipa +## WORKS BEHIND PROXY +BEHIND_PROXY=false # SOURCES & SYSTEM VARS diff --git a/isard-sso b/isard-sso index f6fbeba..f8575b5 160000 --- a/isard-sso +++ b/isard-sso @@ -1 +1 @@ -Subproject commit f6fbeba280e9c841a1eb2fff8287c69ed2c4f322 +Subproject commit f8575b59e14c020c37c5419afff4ab540bd77332