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

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

1 files changed, 11 insertions, 0 deletions

diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp
new file mode 100644
index 0000000..9e26769
--- /dev/null
+++ b/manifests/dist_upgrade.pp
@@ -0,0 +1,11 @@
+class apt::dist_upgrade {
+
+  include apt::update
+
+  exec { 'apt_dist-upgrade':
+    command     => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade",
+    refreshonly => true,
+    require     => Exec['apt_updated'],
+  }
+
+}