security{,_crs}.conf: switch to structured facts #2373
Merged
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
ekohl
reviewed
Jan 31, 2023
templates/mod/security.conf.erb
Outdated
| @@ -54,13 +54,13 @@ | |||
| <%- end -%> | |||
| SecArgumentSeparator & | |||
| SecCookieFormat 0 | |||
| <%- if scope['os::family'] == 'Debian' -%> | |||
| <%- if scope.lookupvar('::osfamily') == 'Debian' -%> | |||
There was a problem hiding this comment.
I think you can also use scope['facts']['os']['family'] if you want to use modern facts.
bastelfreak
added a commit
to bastelfreak/puppetlabs-apache
that referenced
this pull request
Jan 31, 2023
This fixes puppetlabs#2374. The issue was discovered in puppetlabs#2373 while fixing puppetlabs#2371.
175d6d4 broke the template. This commit switches to proper structured facts.
bastelfreak
changed the title
bastelfreak
added a commit
to bastelfreak/puppetlabs-apache
that referenced
this pull request
Jan 31, 2023
This fixes puppetlabs#2374. The issue was discovered in puppetlabs#2373 while fixing puppetlabs#2371.
ekohl
approved these changes
Jan 31, 2023
david22swan
approved these changes
Jan 31, 2023
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.
175d6d4 broke the template.
This commit switches back to the old syntax.This commit switches to proper structured facts.
Contains the same changes as #2372 to validate it works now properly.