Make $apt_clean effective in all cases

The file "/etc/apt/apt.conf.d/from_puppet" is currently only defined
when $custom_sources_list is not used (it is declared in
default_preferences).

Bring this file up in the apt class so that using custom sources doesn't
remove its addition.

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

diff --git a/manifests/default_preferences.pp b/manifests/default_preferences.pp
index 3cdb355221f77ff7e6f80811c183f4d745efc86a..4752fad36a86dd459f6abbe26b87a3ff0d70b14a 100644 (file)
--- a/manifests/default_preferences.pp
+++ b/manifests/default_preferences.pp
@@ -8,9 +8,5 @@ class apt::default_preferences {
       alias => apt_config,
       # only update together
       require => File["/etc/apt/sources.list"];
-    # 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];
   }
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index 98ec91c5274e6a6925808d1b8ef072f0e46f0f5a..9ef1cea70980cafc33037aab3c4718bcc0a84a67 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -29,6 +29,13 @@ class apt {
     }
   }
 
+  config_file {
+    # 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];
+  }
+
   case $custom_preferences {
     '': {
       include apt::default_preferences