aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-10-17 02:11:41 +0200
committerintrigeri <intrigeri@boum.org>2010-10-17 02:11:41 +0200
commite3c8c1b6afc5137be6e15850e9ddfb33894765a2 (patch)
tree195cdec37e255ae0aed9f6e5c8e480f204218357
parentb4d6f30faee423c5b544a1d44724890dcb5418a8 (diff)
downloadpuppet-apt-e3c8c1b6afc5137be6e15850e9ddfb33894765a2.tar.gz
puppet-apt-e3c8c1b6afc5137be6e15850e9ddfb33894765a2.tar.bz2
Bring /etc/apt/apt.conf.d/99from_puppet to init.
APT configuration has (unfortunately) nothing to do with APT preferences.
-rw-r--r--manifests/default_preferences.pp4
-rw-r--r--manifests/init.pp7
2 files changed, 7 insertions, 4 deletions
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
}