From aa4be5a267aa4a046015e93fd23d0a195f1abe24 Mon Sep 17 00:00:00 2001 From: Christer Ekholm Date: Thu, 9 Jul 2020 12:26:35 +0200 Subject: [PATCH] Move default value for $config_template from params.pp to init.pp Since this now has the same value for all OS, this don't need to be set by params.pp --- REFERENCE.md | 2 +- manifests/init.pp | 2 +- manifests/params.pp | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 7de049e..92fb9e9 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -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` diff --git a/manifests/init.pp b/manifests/init.pp index ef86d77..8833f91 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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', diff --git a/manifests/params.pp b/manifests/params.pp index fb357d0..58e19f5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -6,7 +6,6 @@ 'Archlinux' : { $cmdacl = ['cmdallow 127.0.0.1'] $config = '/etc/chrony.conf' - $config_template = 'chrony/chrony.conf.epp' $config_keys = '/etc/chrony.keys' $config_keys_owner = 0 $config_keys_group = 0 @@ -18,7 +17,6 @@ 'Suse', 'RedHat' : { $cmdacl = [] $config = '/etc/chrony.conf' - $config_template = 'chrony/chrony.conf.epp' $config_keys = '/etc/chrony.keys' $config_keys_owner = 0 $config_keys_group = chrony @@ -30,7 +28,6 @@ 'Debian' : { $cmdacl = [] $config = '/etc/chrony/chrony.conf' - $config_template = 'chrony/chrony.conf.epp' $config_keys = '/etc/chrony/chrony.keys' $config_keys_owner = 0 $config_keys_group = 0