X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fkey.pp;h=1f9a495f54f4f3f19424fe571842ed04955bd46f;hb=d5e81157b553ff9ccd425bc26d285a2829281072;hp=13b477060d679786677697db0fab9a1b60dc61d5;hpb=3ca031be3ec38681a6e593093f727beddfb556ed;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/key.pp b/manifests/key.pp index 13b4770..1f9a495 100644 --- a/manifests/key.pp +++ b/manifests/key.pp @@ -29,6 +29,9 @@ # Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, # hkp:// or hkps://). The hkps:// protocol is currently only supported on Ubuntu 18.04. # +# @param weak_ssl +# Specifies whether strict SSL verification on a https URL should be disabled. Valid options: true or false. +# # @param options # Passes additional options to `apt-key adv --keyserver-options`. # @@ -38,6 +41,7 @@ define apt::key ( Optional[String] $content = undef, Optional[Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/]] $source = undef, Pattern[/\A((hkp|hkps|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/] $server = $::apt::keyserver, + Boolean $weak_ssl = false, Optional[String] $options = undef, ) { @@ -49,13 +53,14 @@ define apt::key ( if !defined(Anchor["apt_key ${id} present"]) { apt_key { $title: - ensure => present, - refresh => $ensure == 'refreshed', - id => $id, - source => $source, - content => $content, - server => $server, - options => $options, + ensure => present, + refresh => $ensure == 'refreshed', + id => $id, + source => $source, + content => $content, + server => $server, + weak_ssl => $weak_ssl, + options => $options, } -> anchor { "apt_key ${id} present": } case $facts['os']['name'] { @@ -83,12 +88,13 @@ define apt::key ( if !defined(Anchor["apt_key ${id} absent"]){ apt_key { $title: - ensure => $ensure, - id => $id, - source => $source, - content => $content, - server => $server, - options => $options, + ensure => $ensure, + id => $id, + source => $source, + content => $content, + server => $server, + weak_ssl => $weak_ssl, + options => $options, } -> anchor { "apt_key ${id} absent": } } }