Merge commit 'ac76a5d52df78aec919f08334ca5b140902a9298'

(Starting to merge changes from immerda.)

Conflicts:
	manifests/default_sources_list.pp
	manifests/init.pp

1 files changed, 4 insertions, 7 deletions

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index e1080a0..6a0c685 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -4,14 +4,11 @@ class apt::unattended_upgrades {
     require => undef,
   }
 
-  config_file {
-    "/etc/apt/apt.conf.d/50unattended-upgrades": 
-    source  => ["puppet:///modules/site-apt/50unattended-upgrades", 
-		"puppet:///modules/apt/50unattended-upgrades" ], 
+  apt_conf_snippet { "50unattended-upgrades":
+    source  => ["puppet:///modules/site-apt/50unattended-upgrades",
+		"puppet:///modules/apt/50unattended-upgrades" ],
 
-    # err: Could not run Puppet configuration client: Could not find dependent Config_file[apt_config] for Config_file[/etc/apt/apt.conf.d/50unattended-upgrades] at /etc/puppet/modules/apt/manifests/unattended_upgrades.pp:14
-      
-    #before => Config_file[apt_config],
+    before => Concatenated_file[apt_config],
     require => Package['unattended-upgrades'],
   }
 }