summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-01-30 10:32:15 -0500
committerMicah Anderson <micah@riseup.net>2013-01-30 10:32:15 -0500
commit50bb4b8b4d3f71b2916acbbefca92df9fdc53e68 (patch)
tree8a2ebb653a0b548cecfdcab28f5ac3b1eb1abb33 /puppet
parent6b3dafcb8c18ac31a1d11be661c255ec458d6078 (diff)
provide a fall-back apt.sources.d entry that is disabled by default (#1348)
This file will have the .disabled removed by the apt wrapper when the apt-get update fails
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp5
-rw-r--r--puppet/modules/site_apt/templates/fallback.list3
2 files changed, 8 insertions, 0 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 99bcce4f..beef6fa5 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -8,4 +8,9 @@ class site_apt {
}
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..fa6d041f
--- /dev/null
+++ b/puppet/modules/site_apt/templates/fallback.list
@@ -0,0 +1,3 @@
+# basic
+deb http://ftp.debian.org/debian/ <%= codename %> <%= repos %>
+