Skip to content

Commit

Permalink
WDCONGA-28 Role aem-dispatcher: Fix inheritance of dispatcher configu…
Browse files Browse the repository at this point in the history
…ration lists in combination with custom inherited dispatcher roles.
  • Loading branch information
stefanseifert committed Jan 17, 2020
1 parent 4222d69 commit 339a5d9
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 6 deletions.
3 changes: 3 additions & 0 deletions changes.xml
Expand Up @@ -30,6 +30,9 @@
<action type="fix" dev="bsommerfeld">
Role aem-dispatcher: Use "LocationMatch" instead of "Location ~" to avoid Handlebars whitespace error.
</action>
<action type="fix" dev="sseifert" issue="WDCONGA-28">
Role aem-dispatcher: Fix inheritance of dispatcher configuration lists in combination with custom inherited dispatcher roles.
</action>
</release>

<release version="1.6.0" date="2019-11-22">
Expand Down
36 changes: 30 additions & 6 deletions conga-aem-definitions/src/main/roles/aem-dispatcher.yaml
Expand Up @@ -5,6 +5,30 @@ variants:

# Dispatcher in front of Authoring instance
- variant: aem-author
config:

dispatcher:

# Dispatcher filter rules (use only regex, no glob expressions)
filter:
- url: /.*
type: allow

cache:

# Defines what responses should be cached based on the requested URL
rules:
# Disallow any caching by default and subsequently allow caching
# for content that may be cached although requested with authorization
# information present in the request
- glob: "*"
type: deny

# Defines the pages that are "invalidated" after any activation
invalidate:
- glob: "*"
type: deny


# Disaptcher for publish instances - configure a tenant for each vhost
- variant: aem-publish
Expand Down Expand Up @@ -304,8 +328,8 @@ config:

# Dispatcher filter rules (use only regex, no glob expressions)
filter:
- url: /.*
type: allow
#- url: /.*
# type: allow

# Defines the DispatcherLogLevel (error,warn,info,debug)
logging:
Expand All @@ -325,13 +349,13 @@ config:
# Disallow any caching by default and subsequently allow caching
# for content that may be cached although requested with authorization
# information present in the request
- glob: "*"
type: deny
#- glob: "*"
# type: deny

# Defines the pages that are "invalidated" after any activation
invalidate:
- glob: "*"
type: deny
#- glob: "*"
# type: deny

# Defines query string parameters that should be ignored when determining if some request's output can be cached or delivered from cache
ignoreUrlParams:
Expand Down

0 comments on commit 339a5d9

Please sign in to comment.