From 4afdf95b446d91291d61f44d5564c46a72be7ac1 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 10:45:23 -0500 Subject: [PATCH 1/3] added share context to share config --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2668f47..c1d955c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,9 @@ services: CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*" CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?" JAVA_OPTS: " + -Dshare.host=${PROXY_HOST} + -Dshare.port=${PROXY_PORT} + -Dshare.protocol=${PROXY_PROTOCOL} -Dalfresco.host=${PROXY_HOST} -Dalfresco.port=${PROXY_PORT} -Dalfresco.protocol=${PROXY_PROTOCOL} From ac18d6d63798d9b256aa1953e19d912a8681edb7 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 12:21:21 -0500 Subject: [PATCH 2/3] fixed host/protocol URL rewrites --- nginx-ingress/nginx.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index 467cae0..8124476 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -20,9 +20,10 @@ http { proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; proxy_redirect off; proxy_buffering off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_pass_header Set-Cookie; } } From d70efc69437c46942b7a46e9fd32ac7bcc42991b Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 15:19:41 -0500 Subject: [PATCH 3/3] parameterized AOS --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e667690..31f70e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: -Dalfresco.host=${PROXY_HOST} -Dalfresco.port=${PROXY_PORT} -Dalfresco.protocol=${PROXY_PROTOCOL} - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE -Dcsrf.filter.enabled=false