Merge branch 'develop'

wcm-io-devops · May 11, 2022 · de44e27 · de44e27
2 parents 761c8c3 + b7e84b3
commit de44e27
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 10 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,18 @@
     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="1.12.2" date="2022-05-11">
+      <action type="add" dev="trichter">
+        Role aem-dispatcher: Add remoteip functionality to author vhosts.
+      </action>
+      <action type="add" dev="trichter">
+        Role aem-dispatcher: Introduce httpd.remoteIPHeader to allow configuration of the header representing the client ip.
+      </action>
+      <action type="fix" dev="trichter">
+        Role aem-dispatcher: Fix not working condition for remoteip module introduced with 1.3.0
+      </action>
+    </release>
+
     <release version="1.12.0" date="2022-03-15">
       <action type="add" dev="nbellack">
         Role aem-dispatcher, aem-dispatcher-ams, aem-dispatcher-cloud: Make log level for mod_rewrite configurable.

diff --git a/conga-aem-definitions/pom.xml b/conga-aem-definitions/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.definitions</groupId>
     <artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
-    <version>1.12.0</version>
+    <version>1.12.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
-  <version>1.12.0</version>
+  <version>1.12.2</version>
   <packaging>config-definition</packaging>
 
   <name>CONGA AEM Definitions</name>

diff --git a/conga-aem-definitions/src/main/roles/aem-dispatcher.yaml b/conga-aem-definitions/src/main/roles/aem-dispatcher.yaml
@@ -345,6 +345,8 @@ config:
     remoteIPInternalProxies:
     # - 10.0.2.0/24
     # - gateway.localdomain
+    # The name of the header the remoteip module is using for detecting the client IP address
+    remoteIPHeader: X-Forwarded-For
 
   dispatcher:
 

diff --git a/conga-aem-definitions/src/main/templates/aem-dispatcher/author/vhost_author.partials.hbs b/conga-aem-definitions/src/main/templates/aem-dispatcher/author/vhost_author.partials.hbs
@@ -38,6 +38,17 @@ CustomLog ${APACHE_LOG_DIR}/vhost_author_access.log {{httpd.logging.accessLogFor
 RewriteEngine On
 {{/block}}
 
+{{~#block "remoteIPForwarding"}}
+{{~#if httpd.remoteIPInternalProxies}}
+# Trusted remote ip proxies
+<IfModule mod_remoteip.c>
+{{~#each httpd.remoteIPInternalProxies}}
+RemoteIPInternalProxy {{this}}
+{{~/each}}
+RemoteIPHeader {{httpd.remoteIPHeader}}
+</IfModule>
+{{~/if}}
+{{/block}}
 
 {{~#block "rewriteEnforcePrimaryHostname"}}
 # Make sure primary hostname is always used - but don't rewrite the dispatcher invalidation URL

diff --git a/...m-definitions/src/main/templates/aem-dispatcher/publish/vhost_publish_tenant.partials.hbs b/...m-definitions/src/main/templates/aem-dispatcher/publish/vhost_publish_tenant.partials.hbs
@@ -54,10 +54,11 @@ RewriteEngine On
 {{~#block "remoteIPForwarding"}}
 {{~#if httpd.remoteIPInternalProxies}}
 # Trusted remote ip proxies
-<IfModule remoteip>
+<IfModule mod_remoteip.c>
 {{~#each httpd.remoteIPInternalProxies}}
 RemoteIPInternalProxy {{this}}
 {{~/each}}
+RemoteIPHeader {{httpd.remoteIPHeader}}
 </IfModule>
 {{~/if}}
 {{/block}}

diff --git a/example/pom.xml b/example/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>36</version>
+    <version>44</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem.example</artifactId>
   <packaging>config</packaging>
-  <version>1.12.0</version>
+  <version>1.12.2</version>
 
   <name>CONGA AEM Definitions Example</name>
   <description>Example environment definition.</description>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.definitions</groupId>
       <artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
-      <version>1.12.0</version>
+      <version>1.12.2</version>
     </dependency>
 
   </dependencies>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.2</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
-  <version>1.12.0</version>
+  <version>1.12.2</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Definitions</name>

diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.definitions</groupId>
     <artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
-    <version>1.12.0</version>
+    <version>1.12.2</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem.root</artifactId>
-  <version>1.12.0</version>
+  <version>1.12.2</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Definitions</name>