EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'haproxy-behind' into 'master' 

chore(cfg): allows to start haproxy without opened ports behind another proxy

See merge request digitaldemocratic/digitaldemocratic!40
Josep Maria Viñolas Auquer 2022-01-04 09:34:39 +00:00
parent 9f094f3dc8 75a6b6d2f7
commit a6bcbac95d
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-ctl
View File

@ -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 \

2
digitaldemocratic.conf.sample
View File

@ -102,6 +102,8 @@ MARIADB_PASSWORD=SuperSecret
##=============================================================================
IPA_ADMIN_PWD=freeipafreeipa
## WORKS BEHIND PROXY
BEHIND_PROXY=false
# SOURCES & SYSTEM VARS

2
isard-sso

@ -1 +1 @@
Subproject commit f6fbeba280e9c841a1eb2fff8287c69ed2c4f322
Subproject commit f8575b59e14c020c37c5419afff4ab540bd77332