From: intrigeri <intrigeri@boum.org>
Date: Sun, 21 Nov 2010 15:50:43 +0000 (+0100)
Subject: Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3de76e7b05224b9696a75908b0a4259349e20823;p=puppet-apt.git

Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.

A bunch of painlessly merged commits.

Conflicts:
	manifests/init.pp
---

3de76e7b05224b9696a75908b0a4259349e20823
diff --cc manifests/init.pp
index 54b4fe4,140d2a6..c48cb6e
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -108,23 -54,13 +110,24 @@@ class apt 
      }
    }
  
 +  # backward compatibility: upgrade from previous versions of this module.
 +  file {
 +    ["/etc/apt/apt.conf.d/from_puppet",
 +     "/etc/apt/apt.conf.d/99from_puppet"
 +    ]:
 +      ensure  => 'absent',
 +      require => [ Apt_conf_snippet['02show_upgraded'],
 +                   Apt_conf_snippet['03clean'],
 +                 ],
 +  }
 +
-   if $apt_unattended_upgrades {
-     include apt::unattended_upgrades
-   }
- 
-   # watch apt.conf.d
+   # watch .d directories and ensure they are present
    file { "/etc/apt/apt.conf.d": ensure => directory, checksum => mtime; }
+   file { "/etc/apt/sources.list.d":
+     ensure => directory,
+     checksum => mtime,
+     notify => Exec['refresh_apt'],
+   }
  
    exec {
      # "&& sleep 1" is workaround for older(?) clients