X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;fp=manifests%2Fsource.pp;h=b24aa346852dc5435d1d3c4011d32a5b7d290a59;hb=32eec3baf6171d4f4aeb513f4e481f82a8a92338;hp=da01ef1319e1c33244b72d80844511a7d249949e;hpb=90d3bc58e8dcaf1b95bb785c1a84fc0932a3353c;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/source.pp b/manifests/source.pp index da01ef1..b24aa34 100644 --- a/manifests/source.pp +++ b/manifests/source.pp @@ -99,7 +99,7 @@ define apt::source( $_location = $location } # Newer oses, do not need the package for HTTPS transport. - $_transport_https_releases = [ '7', '8', '9', '14.04', '16.04' ] + $_transport_https_releases = ['9'] if (fact('os.release.major') in $_transport_https_releases) and $_location =~ /(?i:^https:\/\/)/ { ensure_packages('apt-transport-https') Package['apt-transport-https'] -> Class['apt::update'] @@ -111,7 +111,7 @@ define apt::source( $includes = merge($::apt::include_defaults, $include) if $key and $keyring { - fail("parameters key and keyring are mutualy exclusive") + fail('parameters key and keyring are mutualy exclusive') } if $key { @@ -138,8 +138,8 @@ define apt::source( 'includes' => $includes, 'options' => delete_undef_values({ 'arch' => $architecture, - 'trusted' => $allow_unsigned ? {true => "yes", false => undef}, - 'allow-insecure' => $allow_insecure ? {true => "yes", false => undef}, + 'trusted' => $allow_unsigned ? {true => 'yes', false => undef}, + 'allow-insecure' => $allow_insecure ? {true => 'yes', false => undef}, 'signed-by' => $keyring, }), 'location' => $_location,