diff options
author | Gabriel Filion <lelutin@gmail.com> | 2012-09-20 03:55:58 -0400 |
---|---|---|
committer | Gabriel Filion <lelutin@gmail.com> | 2012-09-20 03:55:58 -0400 |
commit | 8229505ecb20da114d76a8704f4566483c965f83 (patch) | |
tree | 542fe92e6c4f38323de1429d5c393a0c7bb82152 /manifests/init.pp | |
parent | 978378623d250a06441650dd969eb01f90891b64 (diff) | |
download | puppet-apt-8229505ecb20da114d76a8704f4566483c965f83.tar.gz puppet-apt-8229505ecb20da114d76a8704f4566483c965f83.tar.bz2 |
Make apt::preferences_snippet place files in /etc/apt/preferences.d
Since Debian Squeeze, apt supports a .d directory for preferences
(pinning). Simplify management by just placing files inside this .d
directory.
This removes the need for concat and concat::fragment resources, so
removes the dependency on the concat module. It also removes the need
for a moduledir that was needed for the concat module magic, so we also
get rid of the dependency on the common module.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 9ce7330..3caa376 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -138,10 +138,6 @@ class apt { # backports uses the normal archive key now package { "debian-backports-keyring": ensure => absent } - include common::moduledir - $apt_base_dir = "${common::moduledir::module_dir_path}/apt" - modules_dir { apt: } - if $custom_key_dir { file { "${apt_base_dir}/keys.d": source => "$custom_key_dir", @@ -155,7 +151,7 @@ class apt { } if $custom_preferences != false { Exec["custom_keys"] { - before => Concat[apt_config], + before => File['apt_config'], } } } |