# ppa.pp
define apt::ppa(
$ensure = 'present',
- $release = $::lsbdistcodename,
$options = $::apt::ppa_options,
+ $release = $::apt::xfacts['lsbdistcodename'],
$package_name = $::apt::ppa_package,
$package_manage = false,
- $proxy = {},
) {
- if ! $release {
+ unless $release {
fail('lsbdistcodename fact not available: release parameter required')
}
- if $::operatingsystem != 'Ubuntu' {
- fail('apt::ppa is currently supported on Ubuntu only.')
+ if $::apt::xfacts['lsbdistid'] == 'Debian' {
+ fail('apt::ppa is not currently supported on Debian.')
}
- $filename_without_slashes = regsubst($name, '/', '-', 'G')
- $filename_without_dots = regsubst($filename_without_slashes, '\.', '_', 'G')
- $filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', 'G')
- $sources_list_d_filename = "${filename_without_ppa}-${release}.list"
+ if versioncmp($::apt::xfacts['lsbdistrelease'], '15.10') >= 0 {
+ $distid = downcase($::apt::xfacts['lsbdistid'])
+ $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2-${release}")
+ } else {
+ $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-\\2-${release}")
+ }
- $_proxy = merge($apt::proxy, $proxy)
+ $filename_no_slashes = regsubst($filename, '/', '-', 'G')
+ $filename_no_specialchars = regsubst($filename_no_slashes, '[\.\+]', '_', 'G')
+ $sources_list_d_filename = "${filename_no_specialchars}.list"
if $ensure == 'present' {
if $package_manage {
- package { $package_name: }
+ ensure_packages($package_name)
$_require = [File['sources.list.d'], Package[$package_name]]
} else {
$_require = File['sources.list.d']
}
- case $_proxy['host'] {
- false, '', undef: {
- $_proxy_env = []
- }
- default: {
- $_proxy_env = ["http_proxy=http://${_proxy['host']}:${_proxy['port']}", "https_proxy=http://${_proxy['host']}:${_proxy['port']}"]
+ $_proxy = $::apt::_proxy
+ if $_proxy['host'] {
+ if $_proxy['https'] {
+ $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}", "https_proxy=https://${$_proxy['host']}:${$_proxy['port']}"]
+ } else {
+ $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}"]
}
+ } else {
+ $_proxy_env = []
}
exec { "add-apt-repository-${name}":
environment => $_proxy_env,
command => "/usr/bin/add-apt-repository ${options} ${name}",
- unless => "/usr/bin/test -s ${::apt::sources_list_d}/${sources_list_d_filename}",
+ unless => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename}",
user => 'root',
logoutput => 'on_failure',
- notify => Exec['apt_update'],
+ notify => Class['apt::update'],
require => $_require,
}
else {
file { "${::apt::sources_list_d}/${sources_list_d_filename}":
ensure => 'absent',
- notify => Exec['apt_update'],
+ notify => Class['apt::update'],
}
}
-
- # Need anchor to provide containment for dependencies.
- anchor { "apt::ppa::${name}":
- require => Class['apt::update'],
- }
}