diff options
| author | mh <mh@immerda.ch> | 2010-10-21 01:59:41 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-10-21 01:59:41 +0200 |
| commit | e2ac1b3d8d1713c81c83a695b776dec1c00d2d47 (patch) | |
| tree | 5ff6553207f4b118562a3be76fc4f7d08638db04 /manifests/preferences.pp | |
| parent | e19c94dcd20c966143c933e22d5a63f350649b6e (diff) | |
| parent | 4dbcd092817708292de6463777b331c8dbc7e727 (diff) | |
| download | puppet-apt-e2ac1b3d8d1713c81c83a695b776dec1c00d2d47.tar.gz puppet-apt-e2ac1b3d8d1713c81c83a695b776dec1c00d2d47.tar.bz2 | |
Merge remote branch 'lelutin/master'
Integrate no custom preference into our new
way to manage the preferences.
Conflicts:
README
manifests/default_preferences.pp
manifests/init.pp
Diffstat (limited to 'manifests/preferences.pp')
| -rw-r--r-- | manifests/preferences.pp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp index 232b8f7..772b426 100644 --- a/manifests/preferences.pp +++ b/manifests/preferences.pp @@ -4,7 +4,8 @@ class apt::preferences { $apt_preferences_dir = "${common::moduledir::module_dir_path}/apt/preferences" module_dir{'apt/preferences': } file{"${apt_preferences_dir}_header": - content => 'Package: * + content => $custom_preferences ? { + '' => 'Package: * Pin: release a=unstable Pin-Priority: 1 @@ -13,6 +14,8 @@ Pin: release a=testing Pin-Priority: 2 ', + default => $custom_preferences + }, } concatenated_file{'/etc/apt/preferences': @@ -25,10 +28,4 @@ Pin-Priority: 2 require => File["/etc/apt/sources.list"]; } - 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 => Concatenated_file[apt_config]; - } } |