Automatically include mod_expires if required via vhost directories #2559
+9
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Similar to other options passed in the vhost's directory this now inspects the directories entry and if expires_* is passed, mod_expires is included.
ekohl
force-pushed
the
auto-include-expires
branch
from
6e42fb2
to
d51909d
Compare
smortex
approved these changes
Aug 22, 2024
ekohl
commented
Aug 29, 2024
| @@ -2362,6 +2362,10 @@ | |||
| if 'setenv' in $directory { | |||
| include apache::mod::env | |||
| } | |||
|
|
|||
| if 'expires_active' in $directory or 'expires_default' in $directory or 'expires_by_type' in $directory { | |||
| include apache::mod::expires | |||
There was a problem hiding this comment.
One thing to note: apache::mod::expires by default writes down a configuration file (unlike other modules). That could be a behavior difference and break setups. Is that a problem?
There was a problem hiding this comment.
Don't we have other modules that do that and thus we include them differently?
There was a problem hiding this comment.
Like
::apache::mod { 'expires': }
There was a problem hiding this comment.
That is exactly the point I tried to make and I'm surprised that CI didn't fail on this:
It feels ugly, but perhaps we should have some helper class that is only the module definition without the configuration file.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Similar to other options passed in the vhost's directory this now inspects the directories entry and if expires_* is passed, mod_expires` is included.
Additional Context
This is a pattern that I've started to apply more and more. It allows passing complex directories (also via Hiera). On our servers we disable the default mods and this ensures we have the correct mods enabled.
Checklist
puppet apply)