summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-11-29 15:57:18 -0500
committerMicah Anderson <micah@riseup.net>2012-11-29 15:58:57 -0500
commit2ac79162239266b6dd0038b54903852675e7c54f (patch)
tree0f89b99e59b61211818cef7e91596f415a278076
parent2727291d734ab5f45be3905982d42192119dce86 (diff)
disable apt pdiffs, they are slow on fast links
-rw-r--r--puppet/modules/site_config/manifests/apt.pp6
-rw-r--r--puppet/modules/site_config/manifests/init.pp9
2 files changed, 12 insertions, 3 deletions
diff --git a/puppet/modules/site_config/manifests/apt.pp b/puppet/modules/site_config/manifests/apt.pp
new file mode 100644
index 00000000..c7490337
--- /dev/null
+++ b/puppet/modules/site_config/manifests/apt.pp
@@ -0,0 +1,6 @@
+class site_config::apt {
+
+ apt::apt_conf { '90disable-pdiffs':
+ content => 'Acquire::PDiffs "false";';
+ }
+}
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/init.pp
index 8aa1b54d..7f67ad4e 100644
--- a/puppet/modules/site_config/manifests/init.pp
+++ b/puppet/modules/site_config/manifests/init.pp
@@ -1,9 +1,12 @@
class site_config {
- # default class, use by all hosts
+ # default class, used by all hosts
- include apt, lsb, git
+ include lsb, git
- # configure ssh and inculde ssh-keys
+ # configure apt
+ include site_config::apt
+
+ # configure ssh and include ssh-keys
include site_config::sshd
# configure /etc/resolv.conf