diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 4107ddd..5abc688 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v4 - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index c709b1c..763171a 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -25,7 +25,7 @@ jobs: git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}" - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 diff --git a/changes.xml b/changes.xml index f8e96e7..ae214bd 100644 --- 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"> + + + Dynamically generate X-Vhost value. + + + Role aem-dispatcher-cloud: Sync with default dispatcher configuration from Adobe AEM project archetype 40 to 47. diff --git a/conga-aem-definitions/pom.xml b/conga-aem-definitions/pom.xml index ded599f..fd08fcd 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 - 2.0.4 + 2.0.6 ../parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 2.0.4 + 2.0.6 config-definition CONGA AEM Definitions diff --git a/conga-aem-definitions/src/main/templates/aem-dispatcher-ams/conf.d/available_vhosts/tenant.vhost.partials.hbs b/conga-aem-definitions/src/main/templates/aem-dispatcher-ams/conf.d/available_vhosts/tenant.vhost.partials.hbs index 9266439..ac06830 100644 --- a/conga-aem-definitions/src/main/templates/aem-dispatcher-ams/conf.d/available_vhosts/tenant.vhost.partials.hbs +++ b/conga-aem-definitions/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 - 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" diff --git a/conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs b/conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs index c4978f5..c27a2fe 100644 --- a/conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs +++ b/conga-aem-definitions/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 - 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" diff --git a/example/pom.xml b/example/pom.xml index f974473..7e05185 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -32,7 +32,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.example config - 2.0.4 + 2.0.6 CONGA AEM Definitions Example Example environment definition. @@ -43,7 +43,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 2.0.4 + 2.0.6 compile diff --git a/parent/pom.xml b/parent/pom.xml index 8ebea8c..3180bda 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.4.4 + 1.4.6 io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 2.0.4 + 2.0.6 pom CONGA AEM Definitions diff --git a/pom.xml b/pom.xml index ee49fc6..5654f0b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 2.0.4 + 2.0.6 parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.root - 2.0.4 + 2.0.6 pom CONGA AEM Definitions