This repository has been archived by the owner on Jan 10, 2023. It is now read-only.
Initial support for puppetserver 2.0.0 paths #8
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
| @@ -4,7 +4,11 @@ | |||
| ) { | |||
| require ::puppetserver::augeas | |||
|
|
|||
| $targetdir = '/etc/puppetserver/conf.d' | |||
| if versioncmp($::puppetversion, '4.0.0') >= 0 { | |||
There was a problem hiding this comment.
I'm surprised this is linked to $::puppetversion…
There was a problem hiding this comment.
@raphink Well, see my initial comment in the PR.
It's not linked, but I don't know a better way to make the decision here, there is no $::puppetserverversion...
There was a problem hiding this comment.
I guess this module would be a proper place to ship such a fact then.
There was a problem hiding this comment.
@raphink I guess it's safe to admit that if puppetversion >= 4.0.0 than we use puppetserver 2.x, so I'm not sure that we need (yet) another fact which will not be available at first run.
mcanevet
added a commit
that referenced
this pull request
Jul 9, 2015
Initial support for puppetserver 2.0.0 paths
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Puppetserver 2.0.0 uses the path /etc/puppetlabs/puppetserver/* now for its configuration files.
This PR adds support for this.
I'm dislike checking for
$::puppetversionbut there is no fact for the the puppetserver version.If you have a better way of checking this, I'm happy to hear it.