Merge remote-tracking branch 'origin/release/v0.2.0'0.2.0

3 files changed, 33 insertions, 0 deletions

diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
new file mode 100644
index 00000000..f129dd73
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -0,0 +1,15 @@
+class site_apt::dist_upgrade {
+
+  if $::apt_running == 'true' { 
+    fail ('apt-get is running in background - Please wait until it finishes. Exiting.')
+  } else {
+    exec{'initial_apt_update':
+      command     => '/usr/bin/apt-get update && /usr/bin/apt-get  autoclean',
+      refreshonly => false,
+    }
+    exec{'initial_apt_dist_upgrade':
+      command     => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold'  dist-upgrade",
+      refreshonly => false,
+    }
+  }
+}
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
new file mode 100644
index 00000000..80c6fbde
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -0,0 +1,15 @@
+class site_apt {
+
+  include ::apt
+
+  apt::apt_conf { '90disable-pdiffs':
+    content => 'Acquire::PDiffs "false";';
+  }
+
+  include ::apt::unattended_upgrades
+
+  apt::sources_list { 'fallback.list.disabled':
+    content => template('site_apt/fallback.list');
+  }
+
+}
diff --git a/puppet/modules/site_apt/templates/fallback.list b/puppet/modules/site_apt/templates/fallback.list
new file mode 100644
index 00000000..41334b0b
--- /dev/null
+++ b/puppet/modules/site_apt/templates/fallback.list
@@ -0,0 +1,3 @@
+# basic
+deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free
+