From: intrigeri <intrigeri@boum.org>
Date: Sun, 17 Oct 2010 00:11:41 +0000 (+0200)
Subject: Bring /etc/apt/apt.conf.d/99from_puppet to init.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e3c8c1b6afc5137be6e15850e9ddfb33894765a2;p=puppet-apt.git

Bring /etc/apt/apt.conf.d/99from_puppet to init.

APT configuration has (unfortunately) nothing to do with APT preferences.
---

diff --git a/manifests/default_preferences.pp b/manifests/default_preferences.pp
index 28471b9..165b364 100644
--- a/manifests/default_preferences.pp
+++ b/manifests/default_preferences.pp
@@ -9,10 +9,6 @@ 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/99from_puppet":
-          content => "APT::Get::Show-Upgraded true;\nDSelect::Clean $real_apt_clean;\n",
-          before => Config_file[apt_config];
       }
     }
     'ubuntu': {
diff --git a/manifests/init.pp b/manifests/init.pp
index ab90c90..d34c89b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -103,6 +103,13 @@ class apt {
     }
   }
 
+  config_file {
+    # little default settings which keep the system sane
+    "/etc/apt/apt.conf.d/99from_puppet":
+      content => "APT::Get::Show-Upgraded true;\nDSelect::Clean $real_apt_clean;\n",
+      before => Config_file[apt_config];
+  }
+
   if $apt_unattended_upgrades {
     include apt::unattended_upgrades
   }