X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=ad80977c68cda73576dbf30b30c06bcd00bbcd54;hb=aba776640b70ab8123d1d614dcc2892d5c42a408;hp=d145918223df02bfc1e3ee52985698edc976a53d;hpb=58f71679ba943ffa0f2c096f6a0853f00d9a8404;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/source.pp b/manifests/source.pp
index d145918..ad80977 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,76 +1,100 @@
 # source.pp
 # add an apt source
-
 define apt::source(
-  $comment           = $name,
-  $ensure            = present,
-  $location          = '',
-  $release           = 'UNDEF',
-  $repos             = 'main',
-  $include_src       = true,
-  $include_deb       = true,
-  $key               = undef,
-  $key_server        = 'keyserver.ubuntu.com',
-  $key_content       = undef,
-  $key_source        = undef,
-  $pin               = false,
-  $architecture      = undef,
-  $trusted_source    = false,
+  Optional[String] $location           = undef,
+  String $comment                      = $name,
+  String $ensure                       = present,
+  Optional[String] $release            = undef,
+  String $repos                        = 'main',
+  Optional[Variant[Hash]] $include     = {},
+  Optional[Variant[String, Hash]] $key = undef,
+  $pin                                 = undef,
+  Optional[String] $architecture       = undef,
+  Boolean $allow_unsigned              = false,
+  Boolean $notify_update               = true,
 ) {
-  validate_string($architecture)
-  validate_bool($trusted_source)
 
-  $sources_list_d = $apt::params::sources_list_d
-  $provider       = $apt::params::provider
+  # This is needed for compat with 1.8.x
+  include ::apt
 
-  if $release == 'UNDEF' {
-    if $::lsbdistcodename == undef {
-      fail('lsbdistcodename fact not available: release parameter required')
+  $_before = Apt::Setting["list-${title}"]
+
+  if ! $release {
+    if $facts['lsbdistcodename'] {
+      $_release = $facts['lsbdistcodename']
     } else {
-      $release_real = $::lsbdistcodename
+      fail('lsbdistcodename fact not available: release parameter required')
     }
   } else {
-    $release_real = $release
+    $_release = $release
   }
 
-  file { "${name}.list":
-    ensure  => $ensure,
-    path    => "${sources_list_d}/${name}.list",
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => template('apt/_header.erb', 'apt/source.list.erb'),
-    notify  => Exec['apt_update'],
+  if $ensure == 'present' and ! $location {
+    fail('cannot create a source entry without specifying a location')
+  }
+
+  $includes = merge($::apt::include_defaults, $include)
+
+  if $key {
+    if is_hash($key) {
+      unless $key['id'] {
+        fail('key hash must contain at least an id entry')
+      }
+      $_key = merge($::apt::source_key_defaults, $key)
+    } else {
+      validate_legacy(String, 'validate_string', $key)
+      $_key = { 'id' => $key }
+    }
   }
 
+  $header = epp('apt/_header.epp')
 
-  if ($pin != false) {
-    # Get the host portion out of the url so we can pin to origin
-    $url_split = split($location, '/')
-    $host      = $url_split[2]
+  $sourcelist = epp('apt/source.list.epp', {
+    'comment'        => $comment,
+    'includes'       => $includes,
+    'architecture'   => $architecture,
+    'allow_unsigned' => $allow_unsigned,
+    'location'       => $location,
+    'release'        => $_release,
+    'repos'          => $repos,
+  })
+
+  apt::setting { "list-${name}":
+    ensure        => $ensure,
+    content       => "${header}${sourcelist}",
+    notify_update => $notify_update,
+  }
 
-    apt::pin { $name:
-      ensure   => $ensure,
-      priority => $pin,
-      before   => File["${name}.list"],
-      origin   => $host,
+  if $pin {
+    if is_hash($pin) {
+      $_pin = merge($pin, { 'ensure' => $ensure, 'before' => $_before })
+    } elsif (is_numeric($pin) or is_string($pin)) {
+      $url_split = split($location, '[:\/]+')
+      $host      = $url_split[1]
+      $_pin = {
+        'ensure'   => $ensure,
+        'priority' => $pin,
+        'before'   => $_before,
+        'origin'   => $host,
+      }
+    } else {
+      fail('Received invalid value for pin parameter')
     }
+    create_resources('apt::pin', { "${name}" => $_pin })
   }
 
   # We do not want to remove keys when the source is absent.
   if $key and ($ensure == 'present') {
-    apt::key { "Add key: ${key} from Apt::Source ${title}":
-      ensure      => present,
-      key         => $key,
-      key_server  => $key_server,
-      key_content => $key_content,
-      key_source  => $key_source,
-      before      => File["${name}.list"],
+    if is_hash($_key) {
+      apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}":
+        ensure  => present,
+        id      => $_key['id'],
+        server  => $_key['server'],
+        content => $_key['content'],
+        source  => $_key['source'],
+        options => $_key['options'],
+        before  => $_before,
+      }
     }
   }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::source::${name}":
-    require => Class['apt::update'],
-  }
 }