Merge pull request #79 from chrekh/epp

Consolidate templates and convert to epp()
voxpupuli · Jul 10, 2020 · f65cccf · f65cccf
2 parents b37d7e8 + 1defd56
commit f65cccf
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 633 deletions.
diff --git 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/config.pp b/manifests/config.pp
@@ -36,7 +36,7 @@
     owner   => 0,
     group   => 0,
     mode    => '0644',
-    content => template($config_template),
+    content => epp($config_template),
   }
 
   file { $config_keys:

diff --git 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
@@ -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
@@ -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
@@ -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