diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-26 15:20:30 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-26 15:20:30 -0200 |
| commit | 75bc1191e8d8694299bb1d228b053469955c976a (patch) | |
| tree | 548bafc890216793aa6317bd1673aa256a663257 /manifests | |
| parent | c2219fa645251599b797b2574e6a68212d676f66 (diff) | |
| download | puppet-apt-75bc1191e8d8694299bb1d228b053469955c976a.tar.gz puppet-apt-75bc1191e8d8694299bb1d228b053469955c976a.tar.bz2 | |
Make custom_key_dir a class parameter and not a global variable
Diffstat (limited to 'manifests')
| -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 020c1cc..d178925 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,7 +15,8 @@ class apt( $ubuntu_url = 'http://archive.ubuntu.com/ubuntu', $repos = 'auto', $custom_preferences = '', - $disable_update = false + $disable_update = false, + $custom_key_dir = false, ){ 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, |