From 5c7ca8c4f7db315d78a351d927dc7455d87e2b2d Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Tue, 2 May 2023 11:10:16 +0200 Subject: [PATCH] comment cas lines needed if oauth2.0 active --- docker-compose.override.yml | 7 ++++++- docker-compose.yml | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index deb2d3d..e0af3f2 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -114,7 +114,12 @@ services: - "traefik.http.middlewares.add-trailing-slash.redirectregex.replacement=https://$${1}/$${2}/" - "traefik.http.middlewares.add-trailing-slash.redirectregex.permanent=false" - +# uncomment for oauth 2.0 +# cas: +# labels: +# - "traefik.enable=true" +# - "traefik.http.routers.cas.tls=true" +# - "traefik.http.routers.cas.rule=Host(`georchestra-127-0-1-1.traefik.me`) && PathPrefix(`/cas`)" smtp: image: camptocamp/smtp-sink:latest volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 44fcd7d..7376de4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,6 +94,30 @@ services: - .envs-ldap - .envs-hosts - .envs-database-georchestra + + +# uncomment for oauth 2.0 +# cas: +# image: georchestra/cas:latest +# healthcheck: +# test: [ "CMD-SHELL", "curl -s -f http://localhost:8080/cas/login >/dev/null || exit 1" ] +# interval: 30s +# timeout: 10s +# retries: 10 +# depends_on: +# ldap: +# condition: service_healthy +# volumes: +# - georchestra_datadir:/etc/georchestra +# environment: +# - JAVA_OPTIONS=-Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF +# - XMS=256M +# - XMX=1G +# env_file: +# - .envs-common +# - .envs-ldap +# - .envs-database-georchestra +# restart: always header: image: georchestra/header:latest