-
-
Notifications
You must be signed in to change notification settings - Fork 881
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add version defaults for Debian, Ubuntu and RedHat (clones)
As discussed before there is an issue with the nginx_version. If the nginx package is not yet installed on a system the fact `nginx_version` is not set. In that case the hard coded default value of `1.16.0` is used. This change will add a default version for some operating systems via hiera data. This avoid the need to run puppet twice to get the correct configuration generated.
- Loading branch information
Showing
9 changed files
with
46 additions
and
4 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
--- | ||
|
||
{} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
--- | ||
|
||
nginx::nginx_version: '1.18.0' |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
--- | ||
|
||
nginx::nginx_version: '1.22.1' |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
--- | ||
|
||
nginx::nginx_version: '1.14.1' |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
--- | ||
|
||
nginx::nginx_version: '1.20.1' |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
--- | ||
|
||
nginx::nginx_version: '1.18.0' |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
--- | ||
|
||
nginx::nginx_version: '1.18.0' |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
--- | ||
version: 5 | ||
|
||
defaults: # Used for any hierarchy level that omits these keys. | ||
datadir: data # This path is relative to hiera.yaml's directory. | ||
data_hash: yaml_data # Use the built-in YAML backend. | ||
|
||
hierarchy: | ||
- name: "osfamily/major release" | ||
paths: | ||
# Used to distinguish between Debian and Ubuntu | ||
- "os/%{facts.os.name}/%{facts.os.release.major}.yaml" | ||
- "os/%{facts.os.family}/%{facts.os.release.major}.yaml" | ||
# Used for Solaris | ||
- "os/%{facts.os.family}/%{facts.kernelrelease}.yaml" | ||
- name: "osfamily" | ||
paths: | ||
- "os/%{facts.os.name}.yaml" | ||
- "os/%{facts.os.family}.yaml" | ||
- name: 'common' | ||
path: 'common.yaml' |
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