From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 18 Jan 2013 12:51:59 +0000 (-0200)
Subject: Merge branch 'master' of git://labs.riseup.net/shared-apt
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c2219fa645251599b797b2574e6a68212d676f66;p=puppet-apt.git

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

Conflicts:
	templates/Ubuntu/sources.list.erb
---

c2219fa645251599b797b2574e6a68212d676f66
diff --cc manifests/unattended_upgrades.pp
index 23d9bd7,c538831..4f1eb20
--- a/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'],
 +    }
 +  }
  }