X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsetting.pp;h=91835cb1b2b88f15387b276660e50a26828bed91;hb=a30791306b26a18d79875dbc1d99b11205802bcc;hp=78f007fdbc6ff9815c5287fc67dab8c2b1501ec6;hpb=1c0c6f106aa7b99241e17406919786df4001c151;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/setting.pp b/manifests/setting.pp
index 78f007f..91835cb 100644
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -1,15 +1,11 @@
 define apt::setting (
-  $setting_type,
-  $base_name  = $title,
-  $priority   = 50,
-  $ensure     = file,
-  $source     = undef,
-  $content    = undef,
-  $file_perms = {},
+  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')
   }
@@ -18,24 +14,22 @@ define apt::setting (
     fail('apt::setting needs either of content or source')
   }
 
-  validate_re($setting_type, ['conf', 'pref', 'list'])
-  validate_re($ensure,  ['file', 'present', 'absent'])
-  validate_string($base_name)
-
-  unless is_integer($priority) {
-    # need this to allow zero-padded priority.
-    validate_re($priority, '^\d+$', 'apt::setting priority must be an integer or a zero-padded integer.')
-  }
+  $title_array = split($title, '-')
+  $setting_type = $title_array[0]
+  $base_name = join(delete_at($title_array, 0), '-')
 
-  if $source {
-    validate_string($source)
+  assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/], $setting_type) |$a, $b| {
+    fail("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
   }
 
-  if $content {
-    validate_string($content)
+  if $priority !~ Integer {
+    # need this to allow zero-padded priority.
+    assert_type(Pattern[/^\d+$/], $priority) |$a, $b| {
+      fail('apt::setting priority must be an integer or a zero-padded integer')
+    }
   }
 
-  if $setting_type == 'list' {
+  if ($setting_type == 'list') or ($setting_type == 'pref') {
     $_priority = ''
   } else {
     $_priority = $priority
@@ -44,12 +38,19 @@ define apt::setting (
   $_path = $::apt::config_files[$setting_type]['path']
   $_ext  = $::apt::config_files[$setting_type]['ext']
 
+  if $notify_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,
   }
 }