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
use variable from params and also validate the purge_preferences_d
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index ce88c3bd83814f575399972fa573463179ad1a77..c42d9ac049ae328076ae5ef183d5fdf5826d5a49 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-20,22
+20,19
@@
# Sample Usage:
# class { 'apt': }
class apt(
# Sample Usage:
# class { 'apt': }
class apt(
- $always_apt_update = false,
- $disable_keys = undef,
- $proxy_host = false,
- $proxy_port = '8080',
- $purge_sources_list = false,
- $purge_sources_list_d = false
+ $always_apt_update = false,
+ $disable_keys = undef,
+ $proxy_host = false,
+ $proxy_port = '8080',
+ $purge_sources_list = false,
+ $purge_sources_list_d = false,
+ $purge_preferences_d = false
) {
include apt::params
include apt::update
) {
include apt::params
include apt::update
- validate_bool($purge_sources_list, $purge_sources_list_d)
-
- if ! defined(Package['python-software-properties']) {
- package { 'python-software-properties': }
- }
+ validate_bool($purge_sources_list, $purge_sources_list_d, $purge_preferences_d)
$sources_list_content = $purge_sources_list ? {
false => undef,
$sources_list_content = $purge_sources_list ? {
false => undef,
@@
-43,7
+40,7
@@
class apt(
}
if $always_apt_update == true {
}
if $always_apt_update == true {
- Exec <| title=='apt
update' |> {
+ Exec <| title=='apt
_
update' |> {
refreshonly => false,
}
}
refreshonly => false,
}
}
@@
-51,6
+48,7
@@
class apt(
$root = $apt::params::root
$apt_conf_d = $apt::params::apt_conf_d
$sources_list_d = $apt::params::sources_list_d
$root = $apt::params::root
$apt_conf_d = $apt::params::apt_conf_d
$sources_list_d = $apt::params::sources_list_d
+ $preferences_d = $apt::params::preferences_d
$provider = $apt::params::provider
file { 'sources.list':
$provider = $apt::params::provider
file { 'sources.list':
@@
-60,7
+58,7
@@
class apt(
group => root,
mode => '0644',
content => $sources_list_content,
group => root,
mode => '0644',
content => $sources_list_content,
- notify => Exec['apt
update'],
+ notify => Exec['apt
_
update'],
}
file { 'sources.list.d':
}
file { 'sources.list.d':
@@
-70,7
+68,16
@@
class apt(
group => root,
purge => $purge_sources_list_d,
recurse => $purge_sources_list_d,
group => root,
purge => $purge_sources_list_d,
recurse => $purge_sources_list_d,
- notify => Exec['apt update'],
+ notify => Exec['apt_update'],
+ }
+
+ file { 'preferences.d':
+ ensure => directory,
+ path => $preferences_d,
+ owner => root,
+ group => root,
+ purge => $purge_preferences_d,
+ recurse => $purge_preferences_d,
}
case $disable_keys {
}
case $disable_keys {
@@
-95,7
+102,12
@@
class apt(
file { 'configure-apt-proxy':
path => "${apt_conf_d}/proxy",
content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
file { 'configure-apt-proxy':
path => "${apt_conf_d}/proxy",
content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
- notify => Exec['apt
update'],
+ notify => Exec['apt
_
update'],
}
}
}
}
+
+ # Need anchor to provide containment for dependencies.
+ anchor { "apt::update":
+ require => Class['apt::update'],
+ }
}
}