Remove the now unused $apt_clean variable

This variable was deprecated in favor of using a list of file sources.
to change the value of the 'clean' property, you can either define a
file '03clean' in a site-apt module, or a per-host '$fqdn/03clean' file
in the same site-apt module.

Also, move the moduledir stuff below nearer to where it's actually used.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>

diff --git a/manifests/init.pp b/manifests/init.pp
index 695c193a99fd34668de29c7b627f327965d69d9d..ea187f34057e540d43a9d7e2650736d24ba46225 100644 (file)
--- 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",