1 files changed, 10 insertions, 17 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 60c95a1..4db120d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -33,25 +33,15 @@ class apt {
     # little default settings which keep the system sane
     "/etc/apt/apt.conf.d/from_puppet":
       content => "APT::Get::Show-Upgraded true;\nDSelect::Clean $real_apt_clean;\n",
-      before => Config_file[apt_config];
+      before => Concatenated_file['/etc/apt/preferences'];
   }
 
   case $custom_preferences {
-    '': {
-      include apt::default_preferences
-    }
     false: {
-      config_file { "/etc/apt/preferences":
-        alias => "apt_config",
-        ensure => absent;
-      }
+      include apt::preferences::absent
     }
     default: {
-      config_file { "/etc/apt/preferences":
-        content => $custom_preferences,
-        alias => "apt_config",
-        require => File["/etc/apt/sources.list"];
-      }
+      include apt::preferences
     }
   }
 
@@ -70,11 +60,13 @@ class apt {
     'refresh_apt':
       command => '/usr/bin/apt-get update && sleep 1',
       refreshonly => true,
-      subscribe => [ File["/etc/apt/sources.list", "/etc/apt/preferences", "/etc/apt/apt.conf.d"],
-                     Config_file["apt_config"] ];
+      subscribe => File['/etc/apt/sources.list',
+                        '/etc/apt/apt.conf.d',
+                        '/etc/apt/preferences'];
       'update_apt':
         command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
-        require => [ File["/etc/apt/sources.list", "/etc/apt/preferences"], Config_file["apt_config"] ],
+        require => File['/etc/apt/sources.list',
+                        '/etc/apt/preferences'],
         loglevel => info,
         # Another Semaphor for all packages to reference
         alias => "apt_updated";
@@ -82,6 +74,7 @@ class apt {
 
   ## This package should really always be current
   package { "debian-archive-keyring": ensure => latest }
+
   # backports uses the normal archive key now
   package { "debian-backports-keyring": ensure => absent }
 
@@ -95,7 +88,7 @@ class apt {
       alias => "custom_keys",
       subscribe => File["${apt_base_dir}/keys.d"],
       refreshonly => true,
-      before => Config_file["apt_config"];
+      before => Concatenated_file[apt_config];
     }
   }