Merge remote-tracking branch 'remotes/origin/master' into nadir_master

Conflicts:
	README
	files/50unattended-upgrades
	files/lenny/50unattended-upgrades
	files/squeeze/50unattended-upgrades
	manifests/dist_upgrade.pp
	manifests/init.pp
	manifests/upgrade_package.pp

1 files changed, 17 insertions, 36 deletions

diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp
index 038d5c9..0c163ae 100644
--- a/manifests/listchanges.pp
+++ b/manifests/listchanges.pp
@@ -1,38 +1,19 @@
-class apt::listchanges {
-
-  case $apt_listchanges_version {
-    '': { $apt_listchanges_version = "present" }
-  }
-
-  case $apt_listchanges_config {
-    '': { $apt_listchanges_config = "apt/${operatingsystem}/listchanges_${lsbdistcodename}.erb" }
-  }
-
-  case $apt_listchanges_frontend {
-    '': { $apt_listchanges_frontend = "mail" }
-  }
-
-  case $apt_listchanges_email {
-    '': { $apt_listchanges_email = "root" }
-  }
-
-  case $apt_listchanges_confirm {
-    '': { $apt_listchanges_confirm = "0" }
-  }
-
-  case $apt_listchanges_saveseen {
-    '': { $apt_listchanges_saveseen = "/var/lib/apt/listchanges.db" }
-  }
-
-  case $apt_listchanges_which {
-    '': { $apt_listchanges_which = "both" }
-  }
-
-  package { apt-listchanges: ensure => $apt_listchanges_ensure_version }
-  
-  file { "/etc/apt/listchanges.conf":
-    content => template($apt_listchanges_config),
-    mode => 0644, owner => root, group => root,
-    require => Package["apt-listchanges"];
+class apt::listchanges(
+  $ensure_version = 'installed',
+  $config = "apt/${::operatingsystem}/listchanges_${::lsbdistcodename}.erb",
+  $frontend = 'mail',
+  $email = 'root',
+  $confirm = '0',
+  $saveseen = '/var/lib/apt/listchanges.db',
+  $which = 'both'
+){
+  package { 'apt-listchanges': ensure => $ensure_version }
+
+  file { '/etc/apt/listchanges.conf':
+    content => template($apt::listchanges::config),
+    owner   => root,
+    group   => root,
+    mode    => '0644',
+    require => Package['apt-listchanges'];
   }
 }