From: Stephen Gran <steve@lobefin.net>
Date: Sat, 24 Dec 2011 10:44:22 +0000 (+0000)
Subject: change default compression type for apt
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=1539d44b2a939cf6945eb1486d48e6d5c24adc91;p=mirror%2Fdsa-puppet.git

change default compression type for apt

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/files/apt.conf.d/local-compression b/modules/debian-org/files/apt.conf.d/local-compression
new file mode 100644
index 000000000..818a6e273
--- /dev/null
+++ b/modules/debian-org/files/apt.conf.d/local-compression
@@ -0,0 +1,15 @@
+//
+// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+//
+
+Acquire {
+  CompressionTypes
+  {
+    bz2 "bzip2";
+    lzma "lzma";
+    gz "gzip";
+
+    Order { "gz"; "lzma"; "bz2"; };
+  };
+};
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 3636c7367..029b34b22 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -78,6 +78,8 @@ class debian-org {
         "/etc/apt/sources.list.d/debian.org.list":
             content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
             notify  => Exec["apt-get update"];
+        "/etc/apt/apt.conf.d/local-compression":
+            source => "puppet:///modules/debian-org/apt.conf.d/local-compression";
         "/etc/apt/apt.conf.d/local-recommends":
             source => "puppet:///modules/debian-org/apt.conf.d/local-recommends";
         "/etc/apt/apt.conf.d/local-pdiffs":
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index e36f484c7..6879c6125 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -323,6 +323,7 @@ file=/etc/apt/sources.list.d/debian.org.list
 file=/etc/apt/sources.list.d/debian.restricted.list
 file=/etc/apt/sources.list.d/debian.list
 file=/etc/apt/sources.list.d/backports.org.list
+file=/etc/apt/apt.conf.d/local-compression
 file=/etc/apt/apt.conf.d/local-recommends
 file=/etc/apt/apt.conf.d/local-pdiffs
 file=/etc/puppet/puppet.conf