Merge branch 'master' of git://labs.riseup.net/shared-apt

Conflicts:
	templates/Ubuntu/sources.list.erb

diff --cc manifests/unattended_upgrades.pp
index 23d9bd73bc4d5cb311b64758cf3f68072711a0b4,c538831cb41a6ae8b2b4e88139d70667c4b5a9ef..4f1eb20237b960c4e5af2626eed90610c2474f42
--- 1/manifests/unattended_upgrades.pp
--- 2/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@@ -13,20 -14,9 +14,20 @@@ class apt::unattended_upgrades 
      require => Package['unattended-upgrades'],
    }
  
-   if $custom_preferences != false {
-     Apt_conf["50unattended-upgrades"] {
-       before => Concat[apt_config],
+   if $apt::custom_preferences != false {
+     Apt_conf['50unattended-upgrades'] {
+       before => File['apt_config'],
      }
    }
 +
 +  if $operatingsystem == 'ubuntu' {
 +    file { '/etc/apt/apt.conf.d/10periodic':
 +      ensure  => present,
 +      owner   => root,
 +      group   => root,
 +      mode    => 0644,
 +      source  => 'puppet:///modules/apt/10periodic',
 +      require => Package['unattended-upgrades'],
 +    }
 +  }
  }