diff --git a/changes.xml b/changes.xml index ab7800d..5cada4e 100644 --- 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"> + + + Role aem-dispatcher: Add remoteip functionality to author vhosts. + + + Role aem-dispatcher: Introduce httpd.remoteIPHeader to allow configuration of the header representing the client ip. + + + Role aem-dispatcher: Fix not working condition for remoteip module introduced with 1.3.0 + + + 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 index 6120535..bb84d73 100644 --- a/conga-aem-definitions/pom.xml +++ b/conga-aem-definitions/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.12.0 + 1.12.2 ../parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.12.0 + 1.12.2 config-definition CONGA AEM Definitions diff --git a/conga-aem-definitions/src/main/roles/aem-dispatcher.yaml b/conga-aem-definitions/src/main/roles/aem-dispatcher.yaml index c1d18ed..8dcb35d 100644 --- 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 index 8c472fc..6cf3578 100644 --- 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 + +{{~#each httpd.remoteIPInternalProxies}} +RemoteIPInternalProxy {{this}} +{{~/each}} +RemoteIPHeader {{httpd.remoteIPHeader}} + +{{~/if}} +{{/block}} {{~#block "rewriteEnforcePrimaryHostname"}} # Make sure primary hostname is always used - but don't rewrite the dispatcher invalidation URL diff --git a/conga-aem-definitions/src/main/templates/aem-dispatcher/publish/vhost_publish_tenant.partials.hbs b/conga-aem-definitions/src/main/templates/aem-dispatcher/publish/vhost_publish_tenant.partials.hbs index 58a8743..3bc49bf 100644 --- a/conga-aem-definitions/src/main/templates/aem-dispatcher/publish/vhost_publish_tenant.partials.hbs +++ b/conga-aem-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 - + {{~#each httpd.remoteIPInternalProxies}} RemoteIPInternalProxy {{this}} {{~/each}} +RemoteIPHeader {{httpd.remoteIPHeader}} {{~/if}} {{/block}} diff --git a/example/pom.xml b/example/pom.xml index 99f6858..0b0c9f5 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -25,14 +25,14 @@ io.wcm.maven io.wcm.maven.global-parent - 36 + 44 io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.example config - 1.12.0 + 1.12.2 CONGA AEM Definitions Example Example environment definition. @@ -43,7 +43,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.12.0 + 1.12.2 diff --git a/parent/pom.xml b/parent/pom.xml index 918cff6..3849548 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.3.0 + 1.3.2 io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.12.0 + 1.12.2 pom CONGA AEM Definitions diff --git a/pom.xml b/pom.xml index 2669699..b13d4b8 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.12.0 + 1.12.2 parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.root - 1.12.0 + 1.12.2 pom CONGA AEM Definitions