Skip to content

Commit 14ef4be

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 1b93b95 + 95035b0 commit 14ef4be

File tree

13 files changed

+129
-77
lines changed

13 files changed

+129
-77
lines changed

‎.github/workflows/release-from-tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: ncipollo/release-action@v1
1717
with:
18-
body: 'Changes: https://devops.wcm.io/conga/definitions/aem/changes-report.html'
18+
body: 'Changes: https://devops.wcm.io/conga/definitions/aem/changes.html'
1919
token: ${{ secrets.GITHUB_TOKEN }}

‎changes.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@
1919
#L%
2020
-->
2121

22-
<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/changes/1.0.0"
23-
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
22+
<document xmlns="http://maven.apache.org/changes/2.0.0"
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
2425
<body>
2526

27+
<release version="2.0.8" date="2025-02-19">
28+
<action type="update" dev="sseifert" issue="94">
29+
Role aem-dispatcher-cloud: Sync with default dispatcher configuration from Adobe AEM project archetype 48 to 51.
30+
</action>
31+
</release>
32+
2633
<release version="2.0.6" date="2024-12-10">
2734
<action type="update" dev="twolfart" issue="93">
2835
Dynamically generate X-Vhost value.

‎conga-aem-definitions/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.definitions</groupId>
2727
<artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
28-
<version>2.0.6</version>
28+
<version>2.0.8</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.definitions</groupId>
3333
<artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
34-
<version>2.0.6</version>
34+
<version>2.0.8</version>
3535
<packaging>config-definition</packaging>
3636

3737
<name>CONGA AEM Definitions</name>

‎conga-aem-definitions/src/main/resources/aem-sdk-dispatcher/src/conf.d/available_vhosts/default.vhost

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Include conf.d/variables/custom.vars
2828
# Some items cache with the wrong mime type
2929
# Use this option to use the name to auto-detect mime types when cached improperly
3030
ModMimeUsePathInfo On
31-
# Use this option to avoid cache poisioning
31+
# Use this option to avoid cache poisoning
3232
# Sling will return /content/image.jpg as well as /content/image.jpg/ but apache can't search /content/image.jpg/ as a file
3333
# Apache will treat that like a directory. This assures the last slash is never stored in cache
3434
DirectorySlash Off

‎conga-aem-definitions/src/main/resources/aem-sdk-dispatcher/src/conf.d/dispatcher_vhost.conf

Lines changed: 88 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Include conf.d/variables/global.vars
1515

1616
# Liveness probe URL
1717
Alias "/system/probes/live" probes/live-status.json
18-
# Readiness probe URL
19-
Alias "/system/probes/ready" probes/ready-status.json
2018
# Startup probe URL
2119
Alias "/system/probes/start" probes/startup-status.json
2220

@@ -111,16 +109,53 @@ Alias "/system/probes/start" probes/startup-status.json
111109
</LocationMatch>
112110
</IfDefine>
113111

114-
# Legacy /systemready mapped to new Health probe URL /system/probes/health in AEM
115-
<Location "/systemready">
116-
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
117-
RewriteEngine Off
118-
</Location>
119-
120-
# Allow ingressroute checks through on /system/probes/health (regardless of dispatcher filters)
121-
<Location "/system/probes/health">
122-
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
123-
RewriteEngine Off
112+
# managed redirect maps not configured (= backward-compatible)
113+
<IfFile !opt-in/managed-rewrite-maps.yaml>
114+
# Legacy /systemready mapped to new Health probe URL /system/probes/health in AEM
115+
<Location "/systemready">
116+
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
117+
RewriteEngine Off
118+
</Location>
119+
120+
# Allow ingressroute checks through on /system/probes/health (regardless of dispatcher filters)
121+
<Location "/system/probes/health">
122+
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
123+
RewriteEngine Off
124+
</Location>
125+
</IfFile>
126+
# managed redirect maps configured
127+
<IfFile opt-in/managed-rewrite-maps.yaml>
128+
# check if traffic can be already allowed to pass (404/redirects not existing yet prevention)
129+
<IfFile /tmp/rewrites/ready>
130+
# Legacy /systemready mapped to new Health probe URL /system/probes/health in AEM
131+
<Location "/systemready">
132+
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
133+
RewriteEngine Off
134+
</Location>
135+
136+
# Allow ingressroute checks through on /system/probes/health (regardless of dispatcher filters)
137+
<Location "/system/probes/health">
138+
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
139+
RewriteEngine Off
140+
</Location>
141+
</IfFile>
142+
# else forcing "403 Forbidden" for Health probes
143+
# "Any code greater than or equal to 200 and less than 400 indicates success. Any other code indicates failure."
144+
# as per https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
145+
<IfFile !/tmp/rewrites/ready>
146+
<Location "/systemready">
147+
Require all denied
148+
</Location>
149+
<Location "/system/probes/health">
150+
Require all denied
151+
</Location>
152+
</IfFile>
153+
</IfFile>
154+
155+
# Readiness probe for K8S Endpoints also depends on AEM readiness probe
156+
<Location "/system/probes/ready">
157+
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/ready
158+
RewriteEngine Off
124159
</Location>
125160

126161
# Allow access to CRXDE on dev environment
@@ -228,48 +263,48 @@ Alias "/gitinit-status" metadata/gitinit-status.json
228263
Require expr "%{HTTP_HOST} == '${POD_NAME}'"
229264
</Directory>
230265

231-
# Dedicated vhost for EaaS:
266+
# Dedicated vhost for Adobe proxy testing:
232267
# (currently disabled, but customers can expect it to be enabled in future versions - CQ-4349728)
233-
#<VirtualHost *:80>
234-
# ServerName "test.eaas"
235-
# # possibility to make overrides before directives in this vhost
236-
# IncludeOptional conf.d/includes/first-listed-vhost.pre.includes
237-
# # since this vhost is first-listed one, this setting influences other vhosts - see https://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize
238-
# LimitRequestFieldSize 32768
239-
# DocumentRoot /var/www/localhost/htdocs
240-
# AllowEncodedSlashes NoDecode
241-
# <IfModule mod_headers.c>
242-
# Header add X-Vhost "test.eaas"
243-
# </IfModule>
244-
# <Directory "/var/www/localhost/htdocs">
245-
# Options Indexes FollowSymLinks
246-
# AllowOverride None
247-
# Require all granted
248-
# </Directory>
249-
#
250-
# # SKYOPS-49434: Allow EaaS to access publish instance directly for dev and stage environments when test.eaas vhost is requested
251-
# <IfDefine ENVIRONMENT_DEV>
252-
# <LocationMatch "/">
253-
# ProxyPassMatch http://${AEM_HOST}:${AEM_PORT}
254-
# RewriteEngine Off
255-
# </LocationMatch>
256-
# </IfDefine>
257-
# <IfDefine ENVIRONMENT_STAGE>
258-
# <LocationMatch "/">
259-
# ProxyPassMatch http://${AEM_HOST}:${AEM_PORT}
260-
# RewriteEngine Off
261-
# </LocationMatch>
262-
# </IfDefine>
263-
# # 403 Forbidden on prod
264-
# <IfDefine ENVIRONMENT_PROD>
265-
# <IfModule mod_rewrite.c>
266-
# RewriteEngine on
267-
# RewriteRule ^ - [F]
268-
# </IfModule>
269-
# </IfDefine>
270-
# # possibility to make overrides after directives in this vhost
271-
# IncludeOptional conf.d/includes/first-listed-vhost.post.includes
272-
#</VirtualHost>
268+
<VirtualHost *:80>
269+
ServerName "test.proxy"
270+
# possibility to make overrides before directives in this vhost
271+
IncludeOptional conf.d/includes/first-listed-vhost.pre.includes
272+
# since this vhost is first-listed one, this setting influences other vhosts - see https://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize
273+
LimitRequestFieldSize 32768
274+
DocumentRoot /var/www/localhost/htdocs
275+
AllowEncodedSlashes NoDecode
276+
<IfModule mod_headers.c>
277+
Header add X-Vhost "test.proxy"
278+
</IfModule>
279+
<Directory "/var/www/localhost/htdocs">
280+
Options Indexes FollowSymLinks
281+
AllowOverride None
282+
Require all granted
283+
</Directory>
284+
285+
# SKYOPS-49434: Allow EaaS to access publish instance directly for dev and stage environments when test.proxy vhost is requested
286+
<IfDefine ENVIRONMENT_DEV>
287+
<LocationMatch "/">
288+
ProxyPassMatch http://${AEM_HOST}:${AEM_PORT}
289+
RewriteEngine Off
290+
</LocationMatch>
291+
</IfDefine>
292+
<IfDefine ENVIRONMENT_STAGE>
293+
<LocationMatch "/">
294+
ProxyPassMatch http://${AEM_HOST}:${AEM_PORT}
295+
RewriteEngine Off
296+
</LocationMatch>
297+
</IfDefine>
298+
# 403 Forbidden on prod
299+
<IfDefine ENVIRONMENT_PROD>
300+
<IfModule mod_rewrite.c>
301+
RewriteEngine on
302+
RewriteRule ^ - [F]
303+
</IfModule>
304+
</IfDefine>
305+
# possibility to make overrides after directives in this vhost
306+
IncludeOptional conf.d/includes/first-listed-vhost.post.includes
307+
</VirtualHost>
273308

274309
# Customer's vhosts:
275310
Include conf.d/enabled_vhosts/*.vhost

‎conga-aem-definitions/src/main/resources/aem-sdk-dispatcher/src/conf.dispatcher.d/available_farms/default.farm

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
#
1010

1111
/publishfarm {
12+
# Dispatcher Debugging Flag
13+
# Include X-Cache-Info response header if X-Dispatcher-Info is in request header
14+
# /info "1"
1215
# client headers which should be passed through to the render instances
1316
# (feature supported since dispatcher build 2.6.3.5222)
1417
/clientheaders {
@@ -34,6 +37,7 @@
3437
# /url "/libs/granite/dispatcher/content/vanityUrls.html"
3538
# /file "/tmp/vanity_urls"
3639
# /delay 300
40+
# /loadOnStartup 1
3741
# }
3842
# allow propagation of replication posts (should seldomly be used)
3943
/propagateSyndPost "0"
@@ -86,9 +90,17 @@
8690
}
8791
# The ignoreUrlParams section contains query string parameter names that
8892
# should be ignored when determining whether some request's output can be
89-
# cached or delivered from cache.
93+
# cached or delivered from cache. Please only enable one of the examples below.
94+
# The recommended setting is to ignore all parameters and selectively allow them. e.g.
95+
# /ignoreUrlParams {
96+
# /0001 { /glob "*" /type "allow" }
97+
# /0002 { /glob "page" /type "deny" }
98+
# /0003 { /glob "product" /type "deny" }
99+
# }
100+
#
90101
# In this example configuration, the "q" parameter will be ignored as
91102
# well as general marketing related parameters such as e.g. utm_campaign.
103+
# If any other parameters are specified the request gets forwarded to the publisher.
92104
# Marketing parameters can normally be ignored on most websites as they are tracked
93105
# through different means.
94106
# /ignoreUrlParams {

‎conga-aem-definitions/src/main/resources/aem-sdk-dispatcher/src/conf.dispatcher.d/filters/default_filters.any

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
# GraphQL Persisted Queries & preflight requests
9797
/0061 { /type "allow" /method '(GET|POST|OPTIONS)' /url "/graphql/execute.json*" }
9898

99-
# Allow Forms Document Services requests
100-
/0062 { /type "allow" /method '(GET|POST)' /url "/adobe/forms/*" }
99+
# Allow Adaptive Form & Document Services requests
100+
/0062 { /type "allow" /method '(GET|POST|OPTIONS)' /url "/adobe/forms/*" }
101101

102102
# Allow PUT for Forms DocAssurance Services Decryption API
103103
/0063 { /type "allow" /method "PUT" /url "/adobe/forms/document/assure/encrypt" }

‎conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ AllowEncodedSlashes NoDecode
4747
# Some items cache with the wrong mime type
4848
# Use this option to use the name to auto-detect mime types when cached improperly
4949
ModMimeUsePathInfo On
50-
# Use this option to avoid cache poisioning
50+
# Use this option to avoid cache poisoning
5151
# Sling will return /content/image.jpg as well as /content/image.jpg/ but apache can't search /content/image.jpg/ as a file
5252
# Apache will treat that like a directory. This assures the last slash is never stored in cache
5353
DirectorySlash Off

‎example/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<groupId>io.wcm.devops.conga.definitions</groupId>
3333
<artifactId>io.wcm.devops.conga.definitions.aem.example</artifactId>
3434
<packaging>config</packaging>
35-
<version>2.0.6</version>
35+
<version>2.0.8</version>
3636

3737
<name>CONGA AEM Definitions Example</name>
3838
<description>Example environment definition.</description>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>io.wcm.devops.conga.definitions</groupId>
4545
<artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
46-
<version>2.0.6</version>
46+
<version>2.0.8</version>
4747
<scope>compile</scope>
4848
</dependency>
4949

‎parent/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops</groupId>
2727
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>1.4.6</version>
28+
<version>1.5.0</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.definitions</groupId>
3333
<artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
34-
<version>2.0.6</version>
34+
<version>2.0.8</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Definitions</name>

0 commit comments

Comments
 (0)