From 1539d44b2a939cf6945eb1486d48e6d5c24adc91 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 24 Dec 2011 10:44:22 +0000 Subject: [PATCH] change default compression type for apt Signed-off-by: Stephen Gran --- .../debian-org/files/apt.conf.d/local-compression | 15 +++++++++++++++ modules/debian-org/manifests/init.pp | 2 ++ modules/samhain/templates/samhainrc.erb | 1 + 3 files changed, 18 insertions(+) create mode 100644 modules/debian-org/files/apt.conf.d/local-compression 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 00000000..818a6e27 --- /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 3636c736..029b34b2 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 e36f484c..6879c612 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 -- 2.39.2