fail('This module only works on Debian or derivatives like Ubuntu')
}
- # Strict variables facts lookup compatibility
- $xfacts = {
- 'lsbdistcodename' => defined('$lsbdistcodename') ? {
- true => $::lsbdistcodename,
- default => undef,
- },
- 'lsbdistrelease' => defined('$lsbdistrelease') ? {
- true => $::lsbdistrelease,
- default => undef,
- },
- 'lsbmajdistrelease' => defined('$lsbmajdistrelease') ? {
- true => $::lsbmajdistrelease,
- default => undef,
- },
- 'lsbdistdescription' => defined('$lsbdistdescription') ? {
- true => $::lsbdistdescription,
- default => undef,
- },
- 'lsbminordistrelease' => defined('$lsbminordistrelease') ? {
- true => $::lsbminordistrelease,
- default => undef,
- },
- 'lsbdistid' => defined('$lsbdistid') ? {
- true => $::lsbdistid,
- default => undef,
- },
+ # prior to puppet 3.5.0, defined couldn't test if a variable was defined
+ # strict variables wasn't added until 3.5.0, so this should be fine.
+ if ! $::settings::strict_variables {
+ $xfacts = {
+ 'lsbdistcodename' => $::lsbdistcodename,
+ 'lsbdistrelease' => $::lsbdistrelease,
+ 'lsbmajdistrelease' => $::lsbmajdistrelease,
+ 'lsbdistdescription' => $::lsbdistdescription,
+ 'lsbminordistrelease' => $::lsbminordistrelease,
+ 'lsbdistid' => $::lsbdistid,
+ }
+ } else {
+ # Strict variables facts lookup compatibility
+ $xfacts = {
+ 'lsbdistcodename' => defined('$lsbdistcodename') ? {
+ true => $::lsbdistcodename,
+ default => undef,
+ },
+ 'lsbdistrelease' => defined('$lsbdistrelease') ? {
+ true => $::lsbdistrelease,
+ default => undef,
+ },
+ 'lsbmajdistrelease' => defined('$lsbmajdistrelease') ? {
+ true => $::lsbmajdistrelease,
+ default => undef,
+ },
+ 'lsbdistdescription' => defined('$lsbdistdescription') ? {
+ true => $::lsbdistdescription,
+ default => undef,
+ },
+ 'lsbminordistrelease' => defined('$lsbminordistrelease') ? {
+ true => $::lsbminordistrelease,
+ default => undef,
+ },
+ 'lsbdistid' => defined('$lsbdistid') ? {
+ true => $::lsbdistid,
+ default => undef,
+ },
+ }
}
$root = '/etc/apt'
},
'pref' => {
'path' => $preferences_d,
- 'ext' => '',
+ 'ext' => '.pref',
},
'list' => {
'path' => $sources_list_d,
}
$proxy_defaults = {
- 'host' => undef,
- 'port' => 8080,
- 'https' => false,
+ 'ensure' => undef,
+ 'host' => undef,
+ 'port' => 8080,
+ 'https' => false,
}
$purge_defaults = {
case $xfacts['lsbdistcodename'] {
'squeeze': {
$backports = {
- 'location' => 'http://backports.debian.org/debian-backports',
+ 'location' => 'http://httpredir.debian.org/debian-backports',
'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'repos' => 'main contrib non-free',
}
}
default: {
$backports = {
- 'location' => 'http://ftp.debian.org/debian/',
+ 'location' => 'http://httpredir.debian.org/debian',
'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'repos' => 'main contrib non-free',
}
}
}
+
+ $ppa_options = undef
+ $ppa_package = undef
+
}
'ubuntu': {
$backports = {
}
}
undef: {
- fail('Unable to determine lsbdistid, is lsb-release installed?')
+ fail('Unable to determine lsbdistid, please install lsb-release first')
}
default: {
$ppa_options = undef