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

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

1 files changed, 23 insertions, 0 deletions

diff --git a/manifests/dist_upgrade/initiator.pp b/manifests/dist_upgrade/initiator.pp
new file mode 100644
index 0000000..6d57947
--- /dev/null
+++ b/manifests/dist_upgrade/initiator.pp
@@ -0,0 +1,23 @@
+class apt::dist_upgrade::initiator inherits apt::dist_upgrade {
+
+  $initiator = 'upgrade_initiator'
+  $initiator_abs = "${apt::apt_base_dir}/${initiator}"
+
+  file { 'apt_upgrade_initiator':
+    mode     => 0644,
+    owner    => root,
+    group    => 0,
+    path     => "${initiator_abs}",
+    checksum => md5,
+    source   => [
+                 "puppet:///modules/site-apt/${fqdn}/${initiator}",
+                 "puppet:///modules/site-apt/${initiator}",
+                 "puppet:///modules/apt/${initiator}",
+                ],
+  }
+
+  Exec['apt_dist-upgrade'] {
+    subscribe +> File['apt_upgrade_initiator'],
+  }
+
+}