Merge remote-tracking branch 'origin/maven/fixes/8.0' into maven/rele…

…ase/8.0
edu-sharing · Nov 27, 2023 · 9263b50 · 9263b50
2 parents b404cc9 + 411d98d
commit 9263b50
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/...src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/.env.sample b/...src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/.env.sample
@@ -114,6 +114,9 @@
 # --- relative login path from external authentication service
 # REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGIN=/shibboleth
 
+# --- relative logout path from external authentication service
+# REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGOUT=/logout
+
 # --- absolut path from external authentication provider
 # REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL=
 
@@ -195,6 +198,9 @@
 # --- time after a session expires in seconds
 # REPOSITORY_SERVICE_HTTP_SERVER_SESSION_TIMEOUT=60
 
+# --- enables transformer (e.g. previews for office files)
+# REPOSITORY_SERVICE_TRANSFORM_ENABLED=true
+
 
 ########################################################################################################################
 ### services-rendering-database
@@ -225,6 +231,8 @@
 # --- public url protocol
 # SERVICES_RENDERING_SERVICE_PROT=http
 
+# --- use dynamic url
+# SERVICES_RENDERING_SERVICE_DYNAMIC_URL=false
 
 # --- enables general data protection regulation
 # SERVICES_RENDERING_SERVICE_GDPR_ENABLED=false

diff --git a/...ources/deploy/docker/services/rendering/build/service/src/main/build/assets/entrypoint.sh b/...ources/deploy/docker/services/rendering/build/service/src/main/build/assets/entrypoint.sh
@@ -19,6 +19,15 @@ my_port_external="${SERVICES_RENDERING_SERVICE_PORT_EXTERNAL:-9100}"
 my_path_external="${SERVICES_RENDERING_SERVICE_PATH_EXTERNAL:-/esrender}"
 my_base_external="${my_prot_external}://${my_host_external}:${my_port_external}${my_path_external}"
 
+
+# used to configure dynamic domains based on the accessing domains
+rendering_service_dynamic_url="${SERVICES_RENDERING_SERVICE_DYNAMIC_URL:-false}"
+
+my_external_url="${my_base_external}"
+if [[ "$rendering_service_dynamic_url" == "true" ]]; then
+  my_external_url="${my_prot_external}://'.\$_SERVER['HTTP_X_FORWARDED_HOST'] ? \$_SERVER['HTTP_X_FORWARDED_HOST'] : \$_SERVER['HTTP_HOST'].':${my_port_external}${my_path_external}"
+fi
+
 my_prot_internal="${SERVICES_RENDERING_SERVICE_PROT_INTERNAL:-http}"
 my_host_internal="${SERVICES_RENDERING_SERVICE_HOST_INTERNAL:-services-rendering-service}"
 my_port_internal="${SERVICES_RENDERING_SERVICE_PORT_INTERNAL:-8080}"
@@ -70,7 +79,6 @@ rendering_video_threads="${SERVICES_RENDERING_VIDEO_THREADS:-"1"}"
 
 
 
-
 ### Wait ###############################################################################################################
 
 [[ -n "${cache_host}" && -n "${cache_port}" ]] && {
@@ -149,7 +157,7 @@ if [[ ! -f "${RS_CACHE}/config/version.json" ]]; then
 	cat >/tmp/config.ini <<-EOF
 		[application]
 		; url for client requests (accessible from the internet)
-		application_url_client="${my_base_external}"
+		application_url_client="${my_external_url}"
 		; url for requests from repository
 		application_url_repository="${my_base_internal}"
 		; ip of the server
@@ -271,7 +279,7 @@ sed -i -r 's|\$dbuser.*|\$dbuser = "'"${rendering_database_user}"'";|' "${dbConf
 sed -i -r 's|\$pwd.*|\$pwd = "'"${rendering_database_pass}"'";|' "${dbConf}"
 
 systemConf="${RS_ROOT}/conf/system.conf.php"
-sed -i -r 's|\$MC_URL = ['"'"'"].*|\$MC_URL = "'"${my_base_external}"'";|' "${systemConf}"
+sed -i -r 's|\$MC_URL = ['"'"'"].*|\$MC_URL = '"'${my_external_url}'"';|' "${systemConf}"
 sed -i -r 's|\$MC_DOCROOT.*|\$MC_DOCROOT = "'"${RS_ROOT}"'";|' "${systemConf}"
 sed -i -r 's|\$CC_RENDER_PATH.*|\$CC_RENDER_PATH = "'"${RS_CACHE}/data"'";|' "${systemConf}"
 

diff --git a/...esources/deploy/docker/services/rendering/compose/src/main/compose/1_rendering-common.yml b/...esources/deploy/docker/services/rendering/compose/src/main/compose/1_rendering-common.yml
@@ -40,6 +40,7 @@ services:
       SERVICES_RENDERING_SERVICE_PORT_EXTERNAL: "${SERVICES_RENDERING_SERVICE_PORT:-9100}"
       SERVICES_RENDERING_SERVICE_PATH_EXTERNAL: "${SERVICES_RENDERING_SERVICE_PATH:-/esrender}"
       SERVICES_RENDERING_SERVICE_PORT_INTERNAL: "8080"
+      SERVICES_RENDERING_SERVICE_DYNAMIC_URL: "${SERVICES_RENDERING_SERVICE_DYNAMIC_URL:-false}"
       SERVICES_RENDERING_SERVICE_PROXY_NONPROXYHOSTS: "${NON_PROXY_HOST:-}"
       SERVICES_RENDERING_SERVICE_PROXY_HOST: "${PROXY_HOST:-}"
       SERVICES_RENDERING_SERVICE_PROXY_PORT: "${PROXY_PORT:-}"