6 files changed, 26 insertions, 51 deletions
diff --git a/manifests/apticron.pp b/manifests/apticron.pp
index 9c94f9c..89709a8 100644
--- a/manifests/apticron.pp
+++ b/manifests/apticron.pp
@@ -1,6 +1,6 @@
 class apt::apticron(
   $ensure_version = 'installed',
-  $config = "apt/${::operatingsystem}/apticron_${::debian_codename}.erb",
+  $config = "apt/${::operatingsystem}/apticron.erb",
   $email = 'root',
   $diff_only = '1',
   $listchanges_profile = 'apticron',
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp
deleted file mode 100644
index 39fc306..0000000
--- a/manifests/cron/base.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-class apt::cron::base {
-
-  package { 'cron-apt': ensure => installed }
-
-  case $apt_cron_hours {
-    '': {}
-    default: {
-      # cron-apt defaults to run every night at 4 o'clock
-      # so we try not to run at the same time.
-      cron { 'apt_cron_every_N_hours':
-        command => 'test -x /usr/sbin/cron-apt && /usr/sbin/cron-apt',
-        user    => root,
-        hour    => "${apt_cron_hours}",
-        minute  => 10,
-        require => Package['cron-apt'],
-      }
-    }
-  }
-
-}
diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp
index 74403bb..e1a03ed 100644
--- a/manifests/cron/dist_upgrade.pp
+++ b/manifests/cron/dist_upgrade.pp
@@ -1,4 +1,23 @@
-class apt::cron::dist_upgrade inherits apt::cron::base {
+class apt::cron::dist_upgrade (
+  $cron_hours = '',
+) {
+
+  package { 'cron-apt': ensure => installed }
+
+  case $cron_hours {
+    '': {}
+    default: {
+      # cron-apt defaults to run every night at 4 o'clock
+      # so we try not to run at the same time.
+      cron { 'apt_cron_every_N_hours':
+        command => 'test -x /usr/sbin/cron-apt && /usr/sbin/cron-apt',
+        user    => root,
+        hour    => "${cron_hours}",
+        minute  => 10,
+        require => Package['cron-apt'],
+      }
+    }
+  }
 
   $action = "autoclean -y
 dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-confold'
diff --git a/manifests/cron/download.pp b/manifests/cron/download.pp
deleted file mode 100644
index 4a19fec..0000000
--- a/manifests/cron/download.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-class apt::cron::download inherits apt::cron::base {
-
-  $action = "autoclean -y
-dist-upgrade -d -y -o APT::Get::Show-Upgraded=true
-"
-
-  file { '/etc/cron-apt/action.d/4-dist-upgrade':
-    ensure => absent,
-  }
-
-  file { '/etc/cron-apt/action.d/3-download':
-    content => $action,
-    require => Package[cron-apt],
-    owner   => root,
-    group   => 0,
-    mode    => '0644';
-  }
-
-  file { '/etc/cron-apt/config.d/MAILON':
-    content => "MAILON=changes\n",
-    require => Package[cron-apt],
-    owner   => root,
-    group   => 0,
-    mode    => '0644';
-  }
-
-}
diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp
index 19c031e..3061fb8 100644
--- a/manifests/dist_upgrade.pp
+++ b/manifests/dist_upgrade.pp
@@ -1,8 +1,11 @@
-class apt::dist_upgrade {
+class apt::dist_upgrade (
+  $timeout = 300,
+) {
 
   exec { 'apt_dist-upgrade':
     command     => '/usr/bin/apt-get -q -y -o \'DPkg::Options::=--force-confold\' dist-upgrade',
     refreshonly => true,
+    timeout     => $timeout,
     before      => Exec['apt_updated']
   }
 
diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp
index e64bb1b..ecbbe6d 100644
--- a/manifests/listchanges.pp
+++ b/manifests/listchanges.pp
@@ -1,6 +1,6 @@
 class apt::listchanges(
   $ensure_version = 'installed',
-  $config = "apt/${::operatingsystem}/listchanges_${::debian_codename}.erb",
+  $config = "apt/${::operatingsystem}/listchanges.erb",
   $frontend = 'mail',
   $email = 'root',
   $confirm = '0',