From 6d396a640f6bc6d21bc2ea52ead6246bd45e0b03 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 11:06:07 -0500 Subject: [PATCH 1/9] added JDBC driver to base config --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index fbc506d..02704c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: image: alfresco/alfresco-content-repository:latest environment: JAVA_OPTS: " + -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" " From b02204d996c76bad4f3f9b8d55731f3829a3757e Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 11:10:46 -0500 Subject: [PATCH 2/9] remove alf-specific variables; renamed existing --- .env | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.env b/.env index fb511c7..39740db 100644 --- a/.env +++ b/.env @@ -1,3 +1 @@ -BASEDIR=~ -ALFRESCO_DIR=${BASEDIR}/alfresco -ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license +EXTERNAL_RESOURCE_DIR=~ From 1ead7a8d1614768dfeb65347429ecfc1eb246b06 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 11:13:00 -0500 Subject: [PATCH 3/9] added alf-specific variables back to docker-compose env in the right branch --- .env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env b/.env index 39740db..e14a1ec 100644 --- a/.env +++ b/.env @@ -1 +1,3 @@ EXTERNAL_RESOURCE_DIR=~ +ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco +ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license From d6b7a879b18289f8aad9fa107e4921e5fcaef7d5 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 11:15:44 -0500 Subject: [PATCH 4/9] added .env configurable platform/share context --- .env | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.env b/.env index 39740db..c230e0c 100644 --- a/.env +++ b/.env @@ -1 +1,8 @@ EXTERNAL_RESOURCE_DIR=~ + +PROXY_PLATFORM_PROTOCOL=http +PROXY_PLATFORM_HOST=localhost +PROXY_PLATFORM_PORT=8080 +PROXY_SHARE_PROTOCOL=http +PROXY_SHARE_HOST=localhost +PROXY_SHARE_PORT=8080 From 3cb24f75875c8d724037062ae70221ef9178798a Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 11:18:58 -0500 Subject: [PATCH 5/9] added proxy config to platform --- docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 02704c8..55a3bf9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,12 @@ services: JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco + -Dshare.host=${PROXY_SHARE_HOST} + -Dshare.port=${PROXY_SHARE_PORT} + -Dshare.protocol=${PROXY_SHARE_PROTOCOL} + -Dalfresco.host=${PROXY_PLATFORM_HOST} + -Dalfresco.port=${PROXY_PLATFORM_PORT} + -Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL} -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" " depends_on: From c0c6dcd1ce136c1bf4592e62062f43c8f0290db4 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 13:51:23 -0500 Subject: [PATCH 6/9] remove share context; moving to acs-share-base --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 55a3bf9..e42df53 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,6 @@ services: JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco - -Dshare.host=${PROXY_SHARE_HOST} - -Dshare.port=${PROXY_SHARE_PORT} - -Dshare.protocol=${PROXY_SHARE_PROTOCOL} -Dalfresco.host=${PROXY_PLATFORM_HOST} -Dalfresco.port=${PROXY_PLATFORM_PORT} -Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL} From 817b062dfddd1035aa68554f55065c042607c482 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 13:54:31 -0500 Subject: [PATCH 7/9] merged platform/share into single proxy --- .env | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.env b/.env index c230e0c..402477f 100644 --- a/.env +++ b/.env @@ -1,8 +1,5 @@ EXTERNAL_RESOURCE_DIR=~ -PROXY_PLATFORM_PROTOCOL=http -PROXY_PLATFORM_HOST=localhost -PROXY_PLATFORM_PORT=8080 -PROXY_SHARE_PROTOCOL=http -PROXY_SHARE_HOST=localhost -PROXY_SHARE_PORT=8080 +PROXY_PROTOCOL=http +PROXY_HOST=localhost +PROXY_PORT=8080 From 1d5624496d7f6418dc99c30747e7e9d10d0c223d Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 13:55:19 -0500 Subject: [PATCH 8/9] renamed proxy variables to match changes to proxy branch --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e42df53..287ccbe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,9 @@ services: JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco - -Dalfresco.host=${PROXY_PLATFORM_HOST} - -Dalfresco.port=${PROXY_PLATFORM_PORT} - -Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL} + -Dalfresco.host=${PROXY_HOST} + -Dalfresco.port=${PROXY_PORT} + -Dalfresco.protocol=${PROXY_PROTOCOL} -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" " depends_on: From ac18d6d63798d9b256aa1953e19d912a8681edb7 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 12:21:21 -0500 Subject: [PATCH 9/9] 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; } }