Merge branch 'master' of git://labs.riseup.net/shared-apt

Conflicts:
	manifests/init.pp
	templates/sources.list.backports.erb

3 files changed, 64 insertions, 0 deletions

diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp
new file mode 100644
index 0000000..7ccfce6
--- /dev/null
+++ b/manifests/cron/base.pp
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0000000..3d7cf16
--- /dev/null
+++ b/manifests/cron/dist-upgrade.pp
@@ -0,0 +1,23 @@
+class apt::cron::dist-upgrade inherits apt::cron::base {
+
+  $action = "autoclean -y
+dist-upgrade -y -o APT::Get::Show-Upgraded=true
+"
+
+  file { "/etc/cron-apt/action.d/3-download":
+    ensure => absent,
+  }
+
+  package { "apt-listbugs": ensure => absent }
+
+  config_file { "/etc/cron-apt/action.d/4-dist-upgrade":
+    content => $action,
+    require => Package[cron-apt]
+  }
+
+  config_file { "/etc/cron-apt/config.d/MAILON":
+    content => "MAILON=upgrade\n",
+    require => Package[cron-apt]
+  }
+
+}
diff --git a/manifests/cron/download.pp b/manifests/cron/download.pp
new file mode 100644
index 0000000..a27967d
--- /dev/null
+++ b/manifests/cron/download.pp
@@ -0,0 +1,21 @@
+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,
+  }
+
+  config_file { "/etc/cron-apt/action.d/3-download":
+    content => $action,
+    require => Package[cron-apt]
+  }
+
+  config_file { "/etc/cron-apt/config.d/MAILON":
+    content => "MAILON=changes\n",
+    require => Package[cron-apt]
+  }
+
+}