Add a 'direct' option to proxy settings

[puppet-modules/puppetlabs-apt.git] / manifests / source.pp

diff --git a/manifests/source.pp b/manifests/source.pp
index e9fa3083039c0aa76c9c4b580a370bc34bc15a63..3e6d0cb814870d0b30a4b3bd0fab11282d4e3935 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,50 +1,106 @@
 # source.pp
 # add an apt source
-
 define apt::source(
-       $location = '',
-       $release = 'karmic',
-       $repos = 'main',
-       $include_src = true,
-       $required_packages = false,
-       $key = false,
-       $key_server = 'keyserver.ubuntu.com',
-       $pin = 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,
+  Optional[Variant[Hash, Numeric, String]] $pin = undef,
+  Optional[String] $architecture                = undef,
+  Boolean $allow_unsigned                       = false,
+  Boolean $notify_update                        = true,
 ) {
 
-       include apt
-
-       file { "${name}.list":
-               name => "${apt::root}/sources.list.d/${name}.list",
-               ensure => file,
-               owner => root,
-               group => root,
-               mode => 644,
-               content => template("apt/source.list.erb"),
-       }
-       
-       if $pin != false {
-               apt::pin { "${release}": priority => "${pin}" }
-       }
-       
-       exec { "${name} apt update":
-               command => "${apt::provider} update",
-               subscribe => File["${name}.list"],
-               refreshonly => true,
-       }
-       
-       if $required_packages != false {
-               exec { "${apt::provider} -y install ${required_packages}":
-                       subscribe => File["${name}.list"],
-                       refreshonly => true,
-               }
-       }
-       
-       if $key != false {
-               exec { "apt-key adv --keyserver ${key_server} --recv-keys ${key}":
-                       unless => "apt-key list | grep ${key}",
-                       before => File["${name}.list"],
-               }
-       }
+  # This is needed for compat with 1.8.x
+  include ::apt
+
+  $_before = Apt::Setting["list-${title}"]
+
+  if !$release {
+    if $facts['lsbdistcodename'] {
+      $_release = $facts['lsbdistcodename']
+    } else {
+      fail('lsbdistcodename fact not available: release parameter required')
+    }
+  } else {
+    $_release = $release
+  }
+
+  if $ensure == 'present' {
+    if ! $location {
+      fail('cannot create a source entry without specifying a location')
+    } elsif $_release == 'jessie' {
+      $method = split($location, '[:\/]+')[0]
+      if $method == 'https' {
+        ensure_packages('apt-transport-https')
+      }
+    }
+  }
+
+  $includes = merge($::apt::include_defaults, $include)
+
+  if $key {
+    if $key =~ Hash {
+      unless $key['id'] {
+        fail('key hash must contain at least an id entry')
+      }
+      $_key = merge($::apt::source_key_defaults, $key)
+    } else {
+      $_key = { 'id' => assert_type(String[1], $key) }
+    }
+  }
+
+  $header = epp('apt/_header.epp')
+
+  $sourcelist = epp('apt/source.list.epp', {
+    'comment'          => $comment,
+    'includes'         => $includes,
+    'opt_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,
+  }
+
+  if $pin {
+    if $pin =~ Hash {
+      $_pin = merge($pin, { 'ensure' => $ensure, 'before' => $_before })
+    } elsif ($pin =~ Numeric or $pin =~ String) {
+      $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') {
+    if $_key =~ Hash {
+      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,
+      }
+    }
+  }
 }