diff options
| author | intrigeri <intrigeri@boum.org> | 2010-12-11 09:39:27 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-12-11 09:39:27 +0100 |
| commit | 1cf642b3a87399c165e9e66399ab92694b27ee43 (patch) | |
| tree | 27f0612ef1104f4158a94bbf9455b25ecf8fa1d6 /manifests/preferences.pp | |
| parent | 5e94f0707c2e77f73444a88844bc800124d6e05e (diff) | |
| parent | ab3a5294cf0ea0cf2ad233e04bf13f7631f9454c (diff) | |
| download | puppet-apt-1cf642b3a87399c165e9e66399ab92694b27ee43.tar.gz puppet-apt-1cf642b3a87399c165e9e66399ab92694b27ee43.tar.bz2 | |
Merge remote branch 'riseup/master'
Diffstat (limited to 'manifests/preferences.pp')
| -rw-r--r-- | manifests/preferences.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp index 4acfdaf..4c93542 100644 --- a/manifests/preferences.pp +++ b/manifests/preferences.pp @@ -3,7 +3,7 @@ class apt::preferences { include common::moduledir $apt_preferences_dir = "${common::moduledir::module_dir_path}/apt/preferences" module_dir{'apt/preferences': } - file{"${apt_preferences_dir}_header": + file { "${apt_preferences_dir}_header": content => $custom_preferences ? { '' => $operatingsystem ? { 'debian' => template("apt/${operatingsystem}/preferences_${codename}.erb"), @@ -13,7 +13,7 @@ class apt::preferences { }, } - concatenated_file{'/etc/apt/preferences': + concatenated_file { '/etc/apt/preferences': dir => $apt_preferences_dir, header => "${apt_preferences_dir}_header", # use Concatenated_file[apt_config] to reference a completed configuration |