introduce preferences snippet

Now, we have the possibility to externally add snippes, so that
we can preferences for packages that are for example only in backports
or unstable.

1 files changed, 6 insertions, 18 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 78ae6c5..12096a0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -29,18 +29,7 @@ class apt {
     }
   }
 
-  case $custom_preferences {
-    '': {
-      include apt::default_preferences
-    }
-    default: {
-      config_file { "/etc/apt/preferences":
-        content => $custom_preferences,
-        alias => apt_config,
-        require => File["/etc/apt/sources.list"];
-      }
-    }
-  }
+  include apt::preferences
 
   if $apt_unattended_upgrades {
     include apt::unattended_upgrades
@@ -58,13 +47,12 @@ class apt {
       command => '/usr/bin/apt-get update && sleep 1',
       refreshonly => true,
       subscribe => [ File["/etc/apt/sources.list"],
-                     File["/etc/apt/preferences"], 
                      File["/etc/apt/apt.conf.d"],
-                     Config_file[apt_config] ];
+                     Concatenated_file[apt_config] ];
       'update_apt':
         command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
         require => [ File["/etc/apt/sources.list"],
-                     File["/etc/apt/preferences"], Config_file[apt_config] ],
+                     File["/etc/apt/preferences"], Concatenated_file[apt_config] ],
         loglevel => info,
         # Another Semaphor for all packages to reference
         alias => apt_updated;
@@ -88,7 +76,7 @@ class apt {
         alias => "backports_key",
         refreshonly => true,
         subscribe => File["${apt_base_dir}/backports.org.key"],
-        before => [ File[apt_config], Package["debian-backports-keyring"] ]
+        before => [ Concatenated_file[apt_config], Package["debian-backports-keyring"] ]
       }
     }
     lenny: {
@@ -105,7 +93,7 @@ class apt {
         alias => "backports_key",
         refreshonly => true,
         subscribe => File["${apt_base_dir}/backports.org.key"],
-        before => [ Config_file[apt_config], Package["debian-backports-keyring"] ]
+        before => [ Concatenated_file[apt_config], Package["debian-backports-keyring"] ]
       }
     }
   }
@@ -120,7 +108,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];
     }
   }