Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #956 from puppetlabs/pdksync_maint/main/release_checks_7_config
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index d95bbe60b2225c20e9c40b236f73a22ee7d1e5e9..ea4e828267225606adfa3d2cdeabf2a4cf407f4b 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-9,6
+9,9
@@
# Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or
# hkp://).
#
# Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or
# hkp://).
#
+# @param key_options
+# Specifies the default options for apt::key resources.
+#
# @param ppa_options
# Supplies options to be passed to the `add-apt-repository` command.
#
# @param ppa_options
# Supplies options to be passed to the `add-apt-repository` command.
#
@@
-115,6
+118,9
@@
# @param config_files
# A hash made up of the various configuration files used by Apt.
#
# @param config_files
# A hash made up of the various configuration files used by Apt.
#
+# @param sources_list_force
+# Specifies whether to perform force purge or delete. Default false.
+#
class apt (
Hash $update_defaults = $apt::params::update_defaults,
Hash $purge_defaults = $apt::params::purge_defaults,
class apt (
Hash $update_defaults = $apt::params::update_defaults,
Hash $purge_defaults = $apt::params::purge_defaults,
@@
-122,6
+128,7
@@
class apt (
Hash $include_defaults = $apt::params::include_defaults,
String $provider = $apt::params::provider,
String $keyserver = $apt::params::keyserver,
Hash $include_defaults = $apt::params::include_defaults,
String $provider = $apt::params::provider,
String $keyserver = $apt::params::keyserver,
+ Optional[String] $key_options = $apt::params::key_options,
Optional[String] $ppa_options = $apt::params::ppa_options,
Optional[String] $ppa_package = $apt::params::ppa_package,
Optional[Hash] $backports = $apt::params::backports,
Optional[String] $ppa_options = $apt::params::ppa_options,
Optional[String] $ppa_package = $apt::params::ppa_package,
Optional[Hash] $backports = $apt::params::backports,
@@
-144,8
+151,10
@@
class apt (
String $conf_d = $apt::params::conf_d,
String $preferences = $apt::params::preferences,
String $preferences_d = $apt::params::preferences_d,
String $conf_d = $apt::params::conf_d,
String $preferences = $apt::params::preferences,
String $preferences_d = $apt::params::preferences_d,
+ String $apt_conf_d = $apt::params::apt_conf_d,
Hash $config_files = $apt::params::config_files,
Hash $source_key_defaults = $apt::params::source_key_defaults,
Hash $config_files = $apt::params::config_files,
Hash $source_key_defaults = $apt::params::source_key_defaults,
+ Boolean $sources_list_force = $apt::params::sources_list_force,
) inherits apt::params {
if $facts['osfamily'] != 'Debian' {
) inherits apt::params {
if $facts['osfamily'] != 'Debian' {
@@
-180,6
+189,12
@@
class apt (
if $purge['preferences.d'] {
assert_type(Boolean, $purge['preferences.d'])
}
if $purge['preferences.d'] {
assert_type(Boolean, $purge['preferences.d'])
}
+ if $sources_list_force {
+ assert_type(Boolean, $sources_list_force)
+ }
+ if $purge['apt.conf.d'] {
+ assert_type(Boolean, $purge['apt.conf.d'])
+ }
$_purge = merge($::apt::purge_defaults, $purge)
$_proxy = merge($apt::proxy_defaults, $proxy)
$_purge = merge($::apt::purge_defaults, $purge)
$_proxy = merge($apt::proxy_defaults, $proxy)
@@
-196,10
+211,27
@@
class apt (
}
}
}
}
- $sources_list_content = $_purge['sources.list'] ? {
- true => "# Repos managed by puppet.\n",
- default => undef,
+ if $sources_list_force {
+ $sources_list_ensure = $_purge['sources.list'] ? {
+ true => absent,
+ default => file,
+ }
+ $sources_list_content = $_purge['sources.list'] ? {
+ true => nil,
+ default => undef,
+ }
}
}
+ else
+ {
+ $sources_list_ensure = $_purge['sources.list'] ? {
+ true => file,
+ default => file,
+ }
+ $sources_list_content = $_purge['sources.list'] ? {
+ true => "# Repos managed by puppet.\n",
+ default => undef,
+ }
+ }
$preferences_ensure = $_purge['preferences'] ? {
true => absent,
$preferences_ensure = $_purge['preferences'] ? {
true => absent,
@@
-218,11
+250,10
@@
class apt (
}
file { 'sources.list':
}
file { 'sources.list':
- ensure =>
fil
e,
+ ensure =>
$sources_list_ensur
e,
path => $::apt::sources_list,
owner => root,
group => root,
path => $::apt::sources_list,
owner => root,
group => root,
- mode => '0644',
content => $sources_list_content,
notify => Class['apt::update'],
}
content => $sources_list_content,
notify => Class['apt::update'],
}
@@
-232,7
+263,6
@@
class apt (
path => $::apt::sources_list_d,
owner => root,
group => root,
path => $::apt::sources_list_d,
owner => root,
group => root,
- mode => '0644',
purge => $_purge['sources.list.d'],
recurse => $_purge['sources.list.d'],
notify => Class['apt::update'],
purge => $_purge['sources.list.d'],
recurse => $_purge['sources.list.d'],
notify => Class['apt::update'],
@@
-243,7
+273,6
@@
class apt (
path => $::apt::preferences,
owner => root,
group => root,
path => $::apt::preferences,
owner => root,
group => root,
- mode => '0644',
notify => Class['apt::update'],
}
notify => Class['apt::update'],
}
@@
-252,12
+281,21
@@
class apt (
path => $::apt::preferences_d,
owner => root,
group => root,
path => $::apt::preferences_d,
owner => root,
group => root,
- mode => '0644',
purge => $_purge['preferences.d'],
recurse => $_purge['preferences.d'],
notify => Class['apt::update'],
}
purge => $_purge['preferences.d'],
recurse => $_purge['preferences.d'],
notify => Class['apt::update'],
}
+ file { 'apt.conf.d':
+ ensure => directory,
+ path => $::apt::apt_conf_d,
+ owner => root,
+ group => root,
+ purge => $_purge['apt.conf.d'],
+ recurse => $_purge['apt.conf.d'],
+ notify => Class['apt::update'],
+ }
+
if $confs {
create_resources('apt::conf', $confs)
}
if $confs {
create_resources('apt::conf', $confs)
}
@@
-291,7
+329,7
@@
class apt (
owner => $auth_conf_owner,
group => 'root',
mode => '0600',
owner => $auth_conf_owner,
group => 'root',
mode => '0600',
- content =>
"${confheadertmp}${auth_conf_tmp}"
,
+ content =>
Sensitive("${confheadertmp}${auth_conf_tmp}")
,
notify => Class['apt::update'],
}
}
notify => Class['apt::update'],
}
}
@@
-302,5
+340,5
@@
class apt (
}
# required for adding GPG keys on Debian 9 (and derivatives)
}
# required for adding GPG keys on Debian 9 (and derivatives)
- ensure_packages(['
dirmngr
'])
+ ensure_packages(['
gnupg
'])
}
}