# 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 versioncmp($::puppetversion, '3.5.0') < 0 {
+ if ! $::settings::strict_variables {
$xfacts = {
'lsbdistcodename' => $::lsbdistcodename,
'lsbdistrelease' => $::lsbdistrelease,
},
'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',
}
}
}
undef: {
- fail('Unable to determine lsbdistid, is lsb-release installed?')
+ fail('Unable to determine lsbdistid, please install lsb-release first')
}
default: {
$ppa_options = undef