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

APT configuration has (unfortunately) nothing to do with APT preferences.
This commit is contained in:
intrigeri 2010-10-17 02:11:41 +02:00
parent b4d6f30fae
commit e3c8c1b6af
2 changed files with 7 additions and 4 deletions

View file

@ -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': {

View file

@ -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
}