Merge commit 'aba291e2de1682620b6dc22446b30fe870b62956' as 'puppet/modules/apt'

3 files changed, 76 insertions, 0 deletions

diff --git a/puppet/modules/apt/manifests/cron/base.pp b/puppet/modules/apt/manifests/cron/base.pp
new file mode 100644
index 00000000..39fc3061
--- /dev/null
+++ b/puppet/modules/apt/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/puppet/modules/apt/manifests/cron/dist_upgrade.pp b/puppet/modules/apt/manifests/cron/dist_upgrade.pp
new file mode 100644
index 00000000..74403bb7
--- /dev/null
+++ b/puppet/modules/apt/manifests/cron/dist_upgrade.pp
@@ -0,0 +1,29 @@
+class apt::cron::dist_upgrade inherits apt::cron::base {
+
+  $action = "autoclean -y
+dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-confold'
+"
+
+  file { '/etc/cron-apt/action.d/3-download':
+    ensure => absent,
+  }
+
+  package { 'apt-listbugs': ensure => absent }
+
+  file { '/etc/cron-apt/action.d/4-dist-upgrade':
+    content => $action,
+    owner   => root,
+    group   => 0,
+    mode    => '0644',
+    require => Package[cron-apt];
+  }
+
+  file { '/etc/cron-apt/config.d/MAILON':
+    content => "MAILON=upgrade\n",
+    owner   => root,
+    group   => 0,
+    mode    => '0644',
+    require => Package[cron-apt];
+  }
+
+}
diff --git a/puppet/modules/apt/manifests/cron/download.pp b/puppet/modules/apt/manifests/cron/download.pp
new file mode 100644
index 00000000..4a19fec1
--- /dev/null
+++ b/puppet/modules/apt/manifests/cron/download.pp
@@ -0,0 +1,27 @@
+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';
+  }
+
+}