Merge pull request #90 from wcm-io-devops/feature/aem-dispatcher-clou…

…d-https-root-redirect Role aem-dispatcher-cloud: Use https in rewriteHomepageRedirect
wcm-io-devops · Jul 13, 2023 · b067db5 · b067db5
2 parents a6c62fe + 8135ea6
commit b067db5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
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.2" date="not released">
+      <action type="fix" dev="trichter" issue="90">
+        Role aem-dispatcher-cloud: Use https in rewriteHomepageRedirect to avoid unnecessary http redirect.
+      </action>
+    </release>
+
     <release version="2.0.0" date="2023-07-03">
       <action type="add" dev="sseifert">
         Role aem-dispatcher-cloud: Add httpd.headers.htmlExpirationTimeSec parameter to control the default expiration time for text/html responses.

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
@@ -214,7 +214,7 @@ RewriteRule ^/(.+)$ /content/$1 [PT,L]
 {{~#block "rewriteHomepageRedirect"}}
 {{~#if httpd.rootRedirect.url}}
 # Root redirect to homepage
-RewriteRule ^/$ {{httpd.rootRedirect.url}} [R={{httpd.rootRedirect.httpStatus}},L]
+RewriteRule ^/$ https://%{HTTP_HOST}{{httpd.rootRedirect.url}} [R={{httpd.rootRedirect.httpStatus}},L]
 {{/if ~}}
 {{/block}}