diff options
| author | intrigeri <intrigeri@boum.org> | 2015-02-28 12:34:54 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2015-02-28 12:34:54 +0000 |
| commit | 31f8661eea49b05f32ccca4ad3d628548ba54b77 (patch) | |
| tree | 93020168f8979b317c3a7c93e2b8ec154078385a /manifests/init.pp | |
| parent | 7c55bee06ab952c914b3a367f495e36a2539807f (diff) | |
| parent | 8ed07cac2f084bfe542f4978daa783aedd7e79b4 (diff) | |
| download | puppet-apt-31f8661eea49b05f32ccca4ad3d628548ba54b77.tar.gz puppet-apt-31f8661eea49b05f32ccca4ad3d628548ba54b77.tar.bz2 | |
Merge branch 'master' into 'master'
Merge with cmaisonnneuve and immerda
See merge request !4
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 2814013..0fb4f1b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -113,9 +113,8 @@ class apt( # backports uses the normal archive key now package { 'debian-backports-keyring': ensure => absent } - include common::moduledir + common::module_dir { 'apt': } $apt_base_dir = "${common::moduledir::module_dir_path}/apt" - modules_dir { 'apt': } if $custom_key_dir { file { "${apt_base_dir}/keys.d": |