diff options
| author | Micah Anderson <micah@riseup.net> | 2013-06-25 16:57:07 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-06-25 16:57:07 -0400 |
| commit | 8f58a40ad81b32e1abed80485d388753deafb87b (patch) | |
| tree | 327fb24935966e567675ede5c57bb1b579c63061 /manifests/init.pp | |
| parent | f11e3d475345059220402a44a97da491c85d2b5a (diff) | |
| parent | 2e3c8fe71cec14411ccee2736f342440a7fedb92 (diff) | |
| download | puppet-apt-8f58a40ad81b32e1abed80485d388753deafb87b.tar.gz puppet-apt-8f58a40ad81b32e1abed80485d388753deafb87b.tar.bz2 | |
Merge branch 'bug/fix_push' into leap
This gets us fixes for the unattended_upgrades in wheezy, as well as the custom_key_dir class parameter replacement of the global variable
Conflicts:
manifests/unattended_upgrades.pp
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index faddf09..33eac37 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,7 +15,8 @@ class apt( $ubuntu_url = $apt::params::ubuntu_url, $repos = $apt::params::repos, $custom_preferences = $apt::params::custom_preferences, - $disable_update = $apt::params::disable_update + $disable_update = $apt::params::disable_update, + $custom_key_dir = $apt::params::custom_key_dir ) inherits apt::params { case $::operatingsystem { 'debian': { @@ -113,9 +114,9 @@ class apt( $apt_base_dir = "${common::moduledir::module_dir_path}/apt" modules_dir { 'apt': } - if $::custom_key_dir { + if $custom_key_dir { file { "${apt_base_dir}/keys.d": - source => $::custom_key_dir, + source => $custom_key_dir, recurse => true, owner => root, group => root, |