# source.pp
# add an apt source
define apt::source(
- $location = undef,
- $comment = $name,
- $ensure = present,
- $release = undef,
- $repos = 'main',
- $include = {},
- $key = undef,
- $pin = undef,
- $architecture = undef,
- $allow_unsigned = false,
- $include_src = undef,
- $include_deb = undef,
- $required_packages = undef,
- $key_server = undef,
- $key_content = undef,
- $key_source = undef,
- $trusted_source = undef,
- $notify_update = true,
+ Optional[Variant[String, Stdlib::Compat::String]] $location = undef,
+ Variant[String, Stdlib::Compat::String] $comment = $name,
+ Variant[String, Stdlib::Compat::String] $ensure = present,
+ Optional[Variant[String, Stdlib::Compat::String]] $release = undef,
+ Variant[String, Stdlib::Compat::String] $repos = 'main',
+ Optional[Variant[Hash, Stdlib::Compat::Hash]] $include = {},
+ Optional[Variant[String, Stdlib::Compat::String, Hash, Stdlib::Compat::Hash]] $key = undef,
+ $pin = undef,
+ Optional[Variant[String, Stdlib::Compat::String]] $architecture = undef,
+ Boolean $allow_unsigned = false,
+ Boolean $notify_update = true,
+ Optional[Variant[String, Stdlib::Compat::String]] $key_server = undef,
+ Optional[Variant[String, Stdlib::Compat::String]] $key_content = undef,
+ Optional[Variant[String, Stdlib::Compat::String]] $key_source = undef,
+ Optional[Boolean] $include_src = undef,
+ Optional[Boolean] $include_deb = undef,
+ $required_packages = undef,
+ $trusted_source = undef,
) {
- validate_string($architecture, $comment, $location, $repos)
- validate_bool($allow_unsigned)
- validate_hash($include)
+
+ validate_legacy(String, 'validate_string', $architecture, $comment, $location, $repos)
+ validate_legacy(Boolean, 'validate_bool', $allow_unsigned)
+ validate_legacy(Hash, 'validate_hash', $include)
# This is needed for compat with 1.8.x
include ::apt
$_before = Apt::Setting["list-${title}"]
- if $include_src != undef {
- warning("\$include_src is deprecated and will be removed in the next major release, please use \$include => { 'src' => ${include_src} } instead")
- }
-
- if $include_deb != undef {
- warning("\$include_deb is deprecated and will be removed in the next major release, please use \$include => { 'deb' => ${include_deb} } instead")
- }
-
if $required_packages != undef {
- warning('$required_packages is deprecated and will be removed in the next major release, please use package resources instead.')
+ 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::params::provider} -y install ${required_packages}",
+ command => "${::apt::provider} -y install ${required_packages}",
logoutput => 'on_failure',
refreshonly => true,
tries => 3,
}
}
- if $key_server != undef {
- warning("\$key_server is deprecated and will be removed in the next major release, please use \$key => { 'server' => ${key_server} } instead.")
- }
-
- if $key_content != undef {
- warning("\$key_content is deprecated and will be removed in the next major release, please use \$key => { 'content' => ${key_content} } instead.")
- }
-
- if $key_source != undef {
- warning("\$key_source is deprecated and will be removed in the next major release, please use \$key => { 'source' => ${key_source} } instead.")
- }
-
if $trusted_source != undef {
- warning('$trusted_source is deprecated and will be removed in the next major release, please use $allow_unsigned instead.')
+ 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 {
- $_release = $::apt::params::xfacts['lsbdistcodename']
- unless $_release {
+ if $facts['lsbdistcodename'] {
+ $_release = $facts['lsbdistcodename']
+ } else {
fail('lsbdistcodename fact not available: release parameter required')
}
} else {
$_deprecated_include = {}
}
- $_include = merge($::apt::params::include_defaults, $_deprecated_include, $include)
+ $includes = merge($::apt::include_defaults, $_deprecated_include, $include)
$_deprecated_key = {
'key_server' => $key_server,
unless $key['id'] {
fail('key hash must contain at least an id entry')
}
- $_key = merge($::apt::params::source_key_defaults, $_deprecated_key, $key)
+ $_key = merge($::apt::source_key_defaults, $_deprecated_key, $key)
} else {
- validate_string($key)
+ validate_legacy(String, 'validate_string', $key)
$_key = merge( { 'id' => $key }, $_deprecated_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 => template('apt/_header.erb', 'apt/source.list.erb'),
+ content => "${header}${sourcelist}",
notify_update => $notify_update,
}
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[2]
+ $url_split = split($location, '[:\/]+')
+ $host = $url_split[1]
$_pin = {
'ensure' => $ensure,
'priority' => $pin,
Code Review / puppet-modules / puppetlabs-apt.git / blobdiff