Merge remote branch 'nadir/master'

Conflicts:
	README
	manifests/custom_sources.pp
	manifests/default_preferences.pp
	manifests/init.pp
	manifests/unattended_upgrades.pp
	templates/Debian/sources.list.volatile.erb

1 files changed, 26 insertions, 0 deletions

diff --git a/manifests/preferences.pp b/manifests/preferences.pp
new file mode 100644
index 0000000..4acfdaf
--- /dev/null
+++ b/manifests/preferences.pp
@@ -0,0 +1,26 @@
+class apt::preferences {
+
+  include common::moduledir
+  $apt_preferences_dir = "${common::moduledir::module_dir_path}/apt/preferences"
+  module_dir{'apt/preferences': }
+  file{"${apt_preferences_dir}_header":
+    content => $custom_preferences ? {
+      '' => $operatingsystem ? {
+        'debian' => template("apt/${operatingsystem}/preferences_${codename}.erb"),
+        'ubuntu' => '',
+      },
+      default => $custom_preferences
+    },
+  }
+
+  concatenated_file{'/etc/apt/preferences':
+    dir => $apt_preferences_dir,
+    header => "${apt_preferences_dir}_header",
+    # use Concatenated_file[apt_config] to reference a completed configuration
+    # See "The Puppet Semaphor" 2007-06-25 on the puppet-users ML
+    alias => apt_config,
+    # only update together
+    require => File["/etc/apt/sources.list"];
+  }
+
+}