Added support for tinydata keys config_file_params and config_dir_par…

…ams. Fixed support for repo_filename
example42 · Jul 19, 2018 · 1b82a47 · 1b82a47
1 parent 530cf18
commit 1b82a47
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/manifests/conf.pp b/manifests/conf.pp
@@ -321,7 +321,7 @@
       before  => File[$manage_path],
     }
   }
-  file { $manage_path:
+  $file_params = {
     ensure       => $ensure,
     source       => $source,
     content      => $manage_content,
@@ -334,6 +334,10 @@
     validate_cmd => $manage_validate_cmd,
   }
 
+  file { $manage_path:
+    * => $file_params + pick($settings[config_file_params],{})
+  }
+
   # Debugging
   if $debug == true {
     $debug_scope = inline_template('<%= scope.to_hash.reject { |k,v| k.to_s =~ /(uptime.*|path|timestamp|free|.*password.*)/ } %>')

diff --git a/manifests/dir.pp b/manifests/dir.pp
@@ -242,7 +242,7 @@
       * => $vcsrepo_defaults + $vcsrepo_options,
     }
   } else {
-    file { $manage_path:
+    $file_params = {
       ensure  => $manage_ensure,
       source  => $source,
       path    => $manage_path,
@@ -255,6 +255,9 @@
       purge   => $purge,
       force   => $force,
     }
+    file { $manage_path:
+      * => $file_params + pick($settings[config_dir_params],{})
+    }
   }
 
   # Debugging

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -164,11 +164,11 @@
           Exec['tp_apt_update'] -> Package[$settings[package_name]]
         }
 
-        if !defined(File["${title}.list"])
+        $aptrepo_title = pick($settings[repo_filename],$title)
+        if !defined(File["${aptrepo_title}.list"])
         and !empty($settings[key])
         and !empty($settings[key_url])
         and !empty($settings[repo_url]) {
-          $aptrepo_title = pick($settings[repo_filename],$title)
           file { "${aptrepo_title}.list":
             ensure  => $ensure,
             path    => "/etc/apt/sources.list.d/${title}.list",
@@ -187,19 +187,20 @@
             command => "wget -O - ${settings[key_url]} | apt-key add -",
             unless  => "apt-key list | grep -q ${settings[key]}",
             path    => '/bin:/sbin:/usr/bin:/usr/sbin',
-            before  => File["${title}.list"],
+            before  => File["${aptrepo_title}.list"],
             user    => 'root',
           }
         }
 
         if !defined(Exec["tp_aptkey_adv_${settings[key]}"])
         and !empty($settings[key])
-        and !empty($settings[apt_key_server]) {
+        and !empty($settings[apt_key_server])
+        and !empty($settings[apt_key_fingerprint]) {
           exec { "tp_aptkey_adv_${settings[key]}":
             command => "apt-key adv --keyserver ${settings[apt_key_server]} --recv ${settings[apt_key_fingerprint]}",
             unless  => "apt-key list | grep -q ${settings[key]}",
             path    => '/bin:/sbin:/usr/bin:/usr/sbin',
-            before  => File["${title}.list"],
+            before  => File["${aptrepo_title}.list"],
             user    => 'root',
           }
         }

diff --git a/types/settings.pp b/types/settings.pp
@@ -19,12 +19,14 @@
   Optional[config_file_owner] => String,
   Optional[config_file_group] => String,
   Optional[config_file_mode] => String,
+  Optional[config_file_params] => Hash,
 
   Optional[config_dir_path] => Stdlib::Absolutepath,
   Optional[config_dir_owner] => String,
   Optional[config_dir_group] => String,
   Optional[config_dir_mode] => String,
   Optional[config_dir_recurse] => Boolean,
+  Optional[config_dir_params] => Hash,
 
   Optional[log_file_path] => Stdlib::Absolutepath,
   Optional[pid_file_path] => Stdlib::Absolutepath,