# source.pp
# add an apt source
define apt::source(
- 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,
- Optional[String] $key_server = undef,
- Optional[String] $key_content = undef,
- Optional[String] $key_source = undef,
- Optional[Boolean] $include_src = undef,
- Optional[Boolean] $include_deb = undef,
- $required_packages = undef,
- $trusted_source = undef,
+ 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,
) {
# This is needed for compat with 1.8.x
$_before = Apt::Setting["list-${title}"]
- if $required_packages != undef {
- deprecation('apt $required_packages', '$required_packages is deprecated and will be removed in the next major release, please use package resources instead.')
- exec { "Required packages: '${required_packages}' for ${name}":
- command => "${::apt::provider} -y install ${required_packages}",
- logoutput => 'on_failure',
- refreshonly => true,
- tries => 3,
- try_sleep => 1,
- before => $_before,
- }
- }
-
- if $trusted_source != undef {
- deprecation('apt $trusted_source', '$trusted_source is deprecated and will be removed in the next major release, please use $allow_unsigned instead.')
- $_allow_unsigned = $trusted_source
- } else {
- $_allow_unsigned = $allow_unsigned
- }
-
- if ! $release {
+ if !$release {
if $facts['lsbdistcodename'] {
$_release = $facts['lsbdistcodename']
} else {
$_release = $release
}
- if $ensure == 'present' and ! $location {
- fail('cannot create a source entry without specifying a location')
- }
+ # Some releases do not support https transport with default installation
+ $_transport_https_releases = [ 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial' ]
- if $include_src != undef and $include_deb != undef {
- $_deprecated_include = {
- 'src' => $include_src,
- 'deb' => $include_deb,
+ if $ensure == 'present' {
+ if ! $location {
+ fail('cannot create a source entry without specifying a location')
+ } elsif $_release in $_transport_https_releases {
+ $method = split($location, '[:\/]+')[0]
+ if $method == 'https' {
+ ensure_packages('apt-transport-https')
+ }
}
- } elsif $include_src != undef {
- $_deprecated_include = { 'src' => $include_src }
- } elsif $include_deb != undef {
- $_deprecated_include = { 'deb' => $include_deb }
- } else {
- $_deprecated_include = {}
}
- $includes = merge($::apt::include_defaults, $_deprecated_include, $include)
-
- $_deprecated_key = {
- 'key_server' => $key_server,
- 'key_content' => $key_content,
- 'key_source' => $key_source,
- }
+ $includes = merge($::apt::include_defaults, $include)
if $key {
- if is_hash($key) {
+ if $key =~ Hash {
unless $key['id'] {
fail('key hash must contain at least an id entry')
}
- $_key = merge($::apt::source_key_defaults, $_deprecated_key, $key)
+ $_key = merge($::apt::source_key_defaults, $key)
} else {
- validate_legacy(String, 'validate_string', $key)
- $_key = merge( { 'id' => $key }, $_deprecated_key)
+ $_key = { 'id' => assert_type(String[1], $key) }
}
}
$header = epp('apt/_header.epp')
$sourcelist = epp('apt/source.list.epp', {
- 'comment' => $comment,
- 'includes' => $includes,
- 'architecture' => $architecture,
- 'allow_unsigned' => $_allow_unsigned,
- 'location' => $location,
- 'release' => $_release,
- 'repos' => $repos,
+ 'comment' => $comment,
+ 'includes' => $includes,
+ 'opt_architecture' => $architecture,
+ 'allow_unsigned' => $allow_unsigned,
+ 'location' => $location,
+ 'release' => $_release,
+ 'repos' => $repos,
})
apt::setting { "list-${name}":
}
if $pin {
- if is_hash($pin) {
+ if $pin =~ Hash {
$_pin = merge($pin, { 'ensure' => $ensure, 'before' => $_before })
- } elsif (is_numeric($pin) or is_string($pin)) {
+ } elsif ($pin =~ Numeric or $pin =~ String) {
$url_split = split($location, '[:\/]+')
$host = $url_split[1]
$_pin = {
# We do not want to remove keys when the source is absent.
if $key and ($ensure == 'present') {
- if is_hash($_key) {
+ 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'],
- key_server => $_key['key_server'],
- key_content => $_key['key_content'],
- key_source => $_key['key_source'],
- before => $_before,
+ ensure => present,
+ id => $_key['id'],
+ server => $_key['server'],
+ content => $_key['content'],
+ source => $_key['source'],
+ options => $_key['options'],
+ before => $_before,
}
}
}
Code Review / puppet-modules / puppetlabs-apt.git / blobdiff