From: Gabriel Filion <lelutin@gmail.com>
Date: Mon, 18 Oct 2010 00:35:35 +0000 (-0400)
Subject: Merge remote branch 'riseup/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=296593bcbd7d5cc329737830bb938f93abf3fa3d;p=puppet-apt.git

Merge remote branch 'riseup/master'

Conflicts:
	manifests/init.pp
---

296593bcbd7d5cc329737830bb938f93abf3fa3d
diff --cc manifests/init.pp
index 78ae6c5,774f9e4..98ec91c
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -110,20 -91,8 +91,6 @@@ class apt 
      }
    }
  
-   if $custom_key_dir {
-     file { "${apt_base_dir}/keys.d":
-       source => "$custom_key_dir",
-       recurse => true,
-       mode => 0755, owner => root, group => root,
-     }
-     exec { "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && apt-get update":
-       alias => "custom_keys",
-       subscribe => File["${apt_base_dir}/keys.d"],
-       refreshonly => true,
-       before => Config_file[apt_config];
-     }
-   }
- 
    # workaround for preseeded_package component
 -  file { "/var/cache": ensure => directory }
 -  file { "/var/cache/local": ensure => directory }
 -  file { "/var/cache/local/preseeding": ensure => directory }
 +  file { [ "/var/cache", "/var/cache/local", "/var/cache/local/preseeding" ]: ensure => directory }
  }