Merge remote branch 'riseup/master'

Conflicts:
	manifests/init.pp

diff --cc manifests/init.pp
index 78ae6c5d4a8cc4b5ce39f8c64511477e87a7e8fd,774f9e41231f70ec31e065a220695667261669da..98ec91c5274e6a6925808d1b8ef072f0e46f0f5a
--- 1/manifests/init.pp
--- 2/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 }
  }