Debian 11: fix typo in versioncmp() / set default php to 7.4
#2186
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
|
|
apache::params is a classBreaking changes to this file WILL impact these 16 modules (exact match):Breaking changes to this file MAY impact these 11 modules (near match):This module is declared in 175 of 578 indexed public
|
tl;dr `$::operatingsystemrelease` is different from `$::operatingsystemmajrelease`. `$::operatingsystemmajrelease` returns '11.0' on Debian 11, whereas `$::operatingsystemmajrelease` is `11`. In addition `versioncmp()` says that `'11.0'` is greater than `11`. Without this change, the module sets the default PHP version on Debian 11 to 7.2, but the actual default in Debian is 7.4: * https://packages.debian.org/bullseye/php The 7.2 currently comes from the default entry in the selector statement: * https://github.com/puppetlabs/puppetlabs-apache/blob/main/manifests/params.pp#L401 To test: ```puppet notify { "operatingsystemrelease compared to 11: ${versioncmp($::operatingsystemrelease, '11')}":} notify { "operatingsystemmajrelease compared to 11: ${versioncmp($::operatingsystemmajrelease, '11')}":} notify { "operatingsystemrelease: ${::operatingsystemrelease}":} notify { "operatingsystemmajrelease: ${::operatingsystemmajrelease}":} ``` which produces: ```terminal puppet apply test.pp Notice: Compiled catalog for blal in environment production in 0.02 seconds Notice: operatingsystemrelease compared to 11: 1 Notice: /Stage[main]/Main/Notify[operatingsystemrelease compared to 11: 1]/message: defined 'message' as 'operatingsystemrelease compared to 11: 1' Notice: operatingsystemmajrelease compared to 11: 0 Notice: /Stage[main]/Main/Notify[operatingsystemmajrelease compared to 11: 0]/message: defined 'message' as 'operatingsystemmajrelease compared to 11: 0' Notice: operatingsystemrelease: 11.0 Notice: /Stage[main]/Main/Notify[operatingsystemrelease: 11.0]/message: defined 'message' as 'operatingsystemrelease: 11.0' Notice: operatingsystemmajrelease: 11.0 Notice: /Stage[main]/Main/Notify[operatingsystemmajrelease: 11.0]/message: defined 'message' as 'operatingsystemmajrelease: 11' Notice: Applied catalog in 0.01 seconds ``` ```terminal :~> facter operatingsystemmajrelease 11 :~> facter operatingsystemrelease 11.0 ``` The spec tests are copied from puppetlabs#2181 Co-authored-by: Kienan Stewart <[email protected]>
bastelfreak
force-pushed
the
debian11
branch
from
7e7fbf6 to
367231e
Compare
|
I also raised a ticket about the versioncmp behaviour: https://tickets.puppetlabs.com/browse/PUP-11235 |
ekohl
reviewed
Sep 1, 2021
Co-authored-by: Ewoud Kohl van Wijngaarden <[email protected]>
ekohl
approved these changes
Sep 1, 2021
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.
tl;dr
$::operatingsystemreleaseis different from$::operatingsystemmajrelease.$::operatingsystemmajreleasereturns'11.0' on Debian 11, whereas
$::operatingsystemmajreleaseis11.In addition
versioncmp()says that'11.0'is greater than11.Without this change, the module sets the default PHP version on Debian
11 to 7.2, but the actual default in Debian is 7.4:
The 7.2 currently comes from the default entry in the selector
statement:
To test:
which produces:
The spec tests are copied from #2181
Co-authored-by: Kienan Stewart [email protected]