X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsetting.pp;h=507ec9495d66ac2e6d305f71596996d34e7e1973;hb=cd2b1dfd2321f9e12b7d6ce29497d0d44914dd14;hp=c288b35d7ec00ce545af777de09bfe977026738c;hpb=b6c70b70e72df46a5884926c0a2c42b8503bb149;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/setting.pp b/manifests/setting.pp
index c288b35..507ec94 100644
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -1,14 +1,11 @@
 define apt::setting (
-  $priority      = 50,
-  $ensure        = file,
-  $source        = undef,
-  $content       = undef,
-  $file_perms    = {},
-  $notify_update = true,
+  Variant[String, Integer, Array] $priority           = 50,
+  Optional[Enum['file', 'present', 'absent']] $ensure = file,
+  Optional[String] $source                            = undef,
+  Optional[String] $content                           = undef,
+  Boolean $notify_update                              = true,
 ) {
 
-  $_file = merge($::apt::file_defaults, $file_perms)
-
   if $content and $source {
     fail('apt::setting cannot have both content and source')
   }
@@ -17,9 +14,6 @@ define apt::setting (
     fail('apt::setting needs either of content or source')
   }
 
-  validate_re($ensure,  ['file', 'present', 'absent'])
-  validate_bool($notify_update)
-
   $title_array = split($title, '-')
   $setting_type = $title_array[0]
   $base_name = join(delete_at($title_array, 0), '-')
@@ -31,15 +25,7 @@ define apt::setting (
     validate_re($priority, '^\d+$', 'apt::setting priority must be an integer or a zero-padded integer')
   }
 
-  if $source {
-    validate_string($source)
-  }
-
-  if $content {
-    validate_string($content)
-  }
-
-  if $setting_type == 'list' {
+  if ($setting_type == 'list') or ($setting_type == 'pref') {
     $_priority = ''
   } else {
     $_priority = $priority
@@ -49,24 +35,18 @@ define apt::setting (
   $_ext  = $::apt::config_files[$setting_type]['ext']
 
   if $notify_update {
-    $_notify = Exec['apt_update']
+    $_notify = Class['apt::update']
   } else {
     $_notify = undef
   }
 
   file { "${_path}/${_priority}${base_name}${_ext}":
     ensure  => $ensure,
-    owner   => $_file['owner'],
-    group   => $_file['group'],
-    mode    => $_file['mode'],
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
     content => $content,
     source  => $source,
     notify  => $_notify,
   }
-
-  if $notify_update {
-    anchor { "apt::setting::${name}":
-      require => Class['apt::update']
-    }
-  }
 }