Merge pull request #93 from twolfart/develop

Dynamically generate X-VHost header
wcm-io-devops · Oct 14, 2024 · aecfb37 · aecfb37
2 parents 3a02ff9 + e51413b
commit aecfb37
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.0.6" date="not released">
+      <action type="update" dev="twolfart" issue="93">
+        Dynamically generate X-Vhost value.
+      </action>
+    </release>
+
     <release version="2.0.4" date="2024-01-26">
       <action type="update" dev="sseifert" issue="91">
         Role aem-dispatcher-cloud: Sync with default dispatcher configuration from Adobe AEM project archetype 40 to 47.

diff --git a/...s/src/main/templates/aem-dispatcher-ams/conf.d/available_vhosts/tenant.vhost.partials.hbs b/...s/src/main/templates/aem-dispatcher-ams/conf.d/available_vhosts/tenant.vhost.partials.hbs
@@ -45,9 +45,11 @@ CustomLog logs/vhost_{{tenant}}_access.log {{httpd.logging.accessLogFormat}}
 {{~#block "generalSettings"}}
 # Use a document root that matches the one in conf.dispatcher.d/default.farm
 DocumentRoot "${PUBLISH_DOCROOT}"
-# Add header breadcrumbs for help in troubleshooting
 <IfModule mod_headers.c>
-  Header add X-Vhost "publish"
+  # Add header breadcrumbs for help in troubleshooting
+{{#httpdCloudManagerConditional}}
+  Header add X-Vhost "{{httpd.serverName}}"
+{{/httpdCloudManagerConditional}}
   # Webserver in AEM cloud service is always terminated with SSL
   RequestHeader set X-Forwarded-SSL "on"
 </IfModule>

diff --git a/...src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs b/...src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs
@@ -34,9 +34,11 @@ ServerAlias {{this}}
 DocumentRoot "${DOCROOT}"
 # URI dereferencing algorithm is applied at Sling's level, do not decode parameters here
 AllowEncodedSlashes NoDecode
-# Add header breadcrumbs for help in troubleshooting
 <IfModule mod_headers.c>
-  Header add X-Vhost "publish"
+  # Add header breadcrumbs for help in troubleshooting
+{{#httpdCloudManagerConditional}}
+  Header add X-Vhost "{{httpd.serverName}}"
+{{/httpdCloudManagerConditional}}
   # Webserver in AEM cloud service is always terminated with SSL
   RequestHeader set X-Forwarded-SSL "on"
 </IfModule>