X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=cb75635797ca882832467d64be7d8228b86765aa;hb=fcb7ebcdc069bbe0fa7759cecdbb84fe2c0cb8d4;hp=981933d0c21ce4d7b1b8664fa5f47b75d038c79f;hpb=65904b214d98c899f390ac6908322fc06e3aca13;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/source.pp b/manifests/source.pp index 981933d..cb75635 100644 --- a/manifests/source.pp +++ b/manifests/source.pp @@ -1,5 +1,59 @@ -# source.pp -# add an apt source +# @summary Manages the Apt sources in /etc/apt/sources.list.d/. +# +# @example Install the puppetlabs apt source +# apt::source { 'puppetlabs': +# location => 'http://apt.puppetlabs.com', +# repos => 'main', +# key => { +# id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', +# server => 'hkps.pool.sks-keyservers.net', +# }, +# } +# +# @param location +# Required, unless ensure is set to 'absent'. Specifies an Apt repository. Valid options: a string containing a repository URL. +# +# @param comment +# Supplies a comment for adding to the Apt source file. +# +# @param ensure +# Specifies whether the Apt source file should exist. Valid options: 'present' and 'absent'. +# +# @param release +# Specifies a distribution of the Apt repository. +# +# @param repos +# Specifies a component of the Apt repository. +# +# @param include +# Configures include options. Valid options: a hash of available keys. +# +# @option include [Boolean] :deb +# Specifies whether to request the distribution's compiled binaries. Default true. +# +# @option include [Boolean] :src +# Specifies whether to request the distribution's uncompiled source code. Default false. +# +# @param key +# Creates a declaration of the apt::key defined type. Valid options: a string to be passed to the `id` parameter of the `apt::key` +# defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, and/or +# `options` parameters. +# +# @param pin +# Creates a declaration of the apt::pin defined type. Valid options: a number or string to be passed to the `id` parameter of the +# `apt::pin` defined type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters. +# +# @param architecture +# Tells Apt to only download information for specified architectures. Valid options: a string containing one or more architecture names, +# separated by commas (e.g., 'i386' or 'i386,alpha,powerpc'). Default: undef (if unspecified, Apt downloads information for all architectures +# defined in the Apt::Architectures option). +# +# @param allow_unsigned +# Specifies whether to authenticate packages from this release, even if the Release file is not signed or the signature can't be checked. +# +# @param notify_update +# Specifies whether to trigger an `apt-get update` run. +# define apt::source( Optional[String] $location = undef, String $comment = $name, @@ -34,7 +88,7 @@ define apt::source( } # Newer oses, do not need the package for HTTPS transport. $_transport_https_releases = [ 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial' ] - if $_release in $_transport_https_releases and $location =~ /(?i:^https:\/\/)/ { + if ($facts['lsbdistcodename'] in $_transport_https_releases) and $location =~ /(?i:^https:\/\/)/ { ensure_packages('apt-transport-https') } } @@ -91,8 +145,14 @@ define apt::source( # We do not want to remove keys when the source is absent. if $key and ($ensure == 'present') { if $_key =~ Hash { + if $_key['ensure'] != undef { + $_ensure = $_key['ensure'] + } else { + $_ensure = $ensure + } + apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}": - ensure => present, + ensure => $_ensure, id => $_key['id'], server => $_key['server'], content => $_key['content'],