diff options
| -rw-r--r-- | manifests/init.pp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 695c193..ea187f3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,12 +5,6 @@ class apt { - # See README - $real_apt_clean = $apt_clean ? { - '' => 'auto', - default => $apt_clean, - } - package { apt: ensure => installed, require => undef, @@ -54,9 +48,6 @@ class apt { include apt::unattended_upgrades } - include common::moduledir - $apt_base_dir = "${common::moduledir::module_dir_path}/apt" - modules_dir { apt: } # watch apt.conf.d file { "/etc/apt/apt.conf.d": ensure => directory, checksum => mtime; } @@ -83,6 +74,10 @@ class apt { # backports uses the normal archive key now package { "debian-backports-keyring": ensure => absent } + include common::moduledir + $apt_base_dir = "${common::moduledir::module_dir_path}/apt" + modules_dir { apt: } + if $custom_key_dir { file { "${apt_base_dir}/keys.d": source => "$custom_key_dir", |