diff options
| author | intrigeri <intrigeri@boum.org> | 2010-10-17 01:57:55 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-10-17 01:57:55 +0200 |
| commit | bcfb35c969de53aa2972a9d2415be5a258a01be8 (patch) | |
| tree | 9666e083c5391235f97c86032e979973ef299ee6 /manifests/default_preferences.pp | |
| parent | e2f80db7b76171e5945127e2fd42fb35043990fb (diff) | |
| parent | eae01000c1db8bcfa7de17b2a9a8370289b801bc (diff) | |
| download | puppet-apt-bcfb35c969de53aa2972a9d2415be5a258a01be8.tar.gz puppet-apt-bcfb35c969de53aa2972a9d2415be5a258a01be8.tar.bz2 | |
Merge remote branch 'nadir/master' into wip
Conflicts:
manifests/default_preferences.pp
manifests/default_sources_list.pp
manifests/init.pp
templates/Debian/sources.list.deb-src.erb
templates/Debian/sources.list.erb
templates/Debian/sources.list.volatile.erb
templates/Ubuntu/sources.list.erb
Diffstat (limited to 'manifests/default_preferences.pp')
| -rw-r--r-- | manifests/default_preferences.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/default_preferences.pp b/manifests/default_preferences.pp index 605ba78..28471b9 100644 --- a/manifests/default_preferences.pp +++ b/manifests/default_preferences.pp @@ -10,7 +10,7 @@ class apt::default_preferences { # only update together require => File["/etc/apt/sources.list"]; # little default settings which keep the system sane - "/etc/apt/apt.conf.d/from_puppet": + "/etc/apt/apt.conf.d/99from_puppet": content => "APT::Get::Show-Upgraded true;\nDSelect::Clean $real_apt_clean;\n", before => Config_file[apt_config]; } |