Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate templates and convert to epp() #79

Merged
merged 4 commits into from
Jul 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Data type: `String[1]`

This determines which template puppet should use for the chrony configuration.

Default value: $chrony::params::config_template
Default value: 'chrony/chrony.conf.epp'

##### `config_keys`

Expand Down
2 changes: 1 addition & 1 deletion manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
owner => 0,
group => 0,
mode => '0644',
content => template($config_template),
content => epp($config_template),
}

file { $config_keys:
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
Optional[Stdlib::Port] $cmdport = undef,
$commandkey = 0,
Stdlib::Unixpath $config = $chrony::params::config,
String[1] $config_template = $chrony::params::config_template,
String[1] $config_template = 'chrony/chrony.conf.epp',
Stdlib::Unixpath $config_keys = $chrony::params::config_keys,
String[1] $config_keys_template = 'chrony/chrony.keys.erb',
String[1] $chrony_password = 'xyzzy',
Expand Down
3 changes: 0 additions & 3 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
'Archlinux' : {
$cmdacl = ['cmdallow 127.0.0.1']
$config = '/etc/chrony.conf'
$config_template = 'chrony/chrony.conf.archlinux.erb'
$config_keys = '/etc/chrony.keys'
$config_keys_owner = 0
$config_keys_group = 0
Expand All @@ -18,7 +17,6 @@
'Suse', 'RedHat' : {
$cmdacl = []
$config = '/etc/chrony.conf'
$config_template = 'chrony/chrony.conf.redhat.erb'
$config_keys = '/etc/chrony.keys'
$config_keys_owner = 0
$config_keys_group = chrony
Expand All @@ -30,7 +28,6 @@
'Debian' : {
$cmdacl = []
$config = '/etc/chrony/chrony.conf'
$config_template = 'chrony/chrony.conf.debian.erb'
$config_keys = '/etc/chrony/chrony.keys'
$config_keys_owner = 0
$config_keys_group = 0
Expand Down
Loading