diff options
| -rw-r--r-- | README | 17 | ||||
| -rw-r--r-- | files/03clean_vserver | 4 | ||||
| -rw-r--r-- | manifests/init.pp | 19 |
3 files changed, 27 insertions, 13 deletions
@@ -20,10 +20,10 @@ This module needs: - lsb-release installed - the common module: git://labs.riseup.net/shared-common -By default, this module sets the configuration option DSelect::Clean to 'auto'. -It is the recommended value on normal hosts. On virtual servers, the -recommended value is 'pre-auto', since virtual servers are usually more -space-bound and have better recovery mechanisms via the host: +By default, on normal hosts, this module sets the configuration option +DSelect::Clean to 'auto'. On virtual servers, the value is set by default to +'pre-auto', because virtual servers are usually more space-bound and have better +recovery mechanisms via the host: From apt.conf(5), 0.7.2: "Cache Clean mode; this value may be one of always, prompt, auto, @@ -35,10 +35,11 @@ From apt.conf(5), 0.7.2: packages." To change the default setting for DSelect::Clean, you can create a file named -"03clean" in a site-apt module's files directory. You can also define this for -a specific host by creating a file in a subdirectory of the site-apt modules' -files directory that is named the same as the host. (example: -site-apt/files/some.host.com/03clean) +"03clean" or "03clean_vserver" in your site-apt module's files directory. You +can also define this for a specific host by creating a file in a subdirectory of +the site-apt modules' files directory that is named the same as the +host. (example: site-apt/files/some.host.com/03clean, or +site-apt/files/some.host.com/03clean_vserver) Variables ========= diff --git a/files/03clean_vserver b/files/03clean_vserver new file mode 100644 index 0000000..6bb84e5 --- /dev/null +++ b/files/03clean_vserver @@ -0,0 +1,4 @@ +// This file is managed by Puppet +// all local modifications will be overwritten + +DSelect::Clean pre-auto; diff --git a/manifests/init.pp b/manifests/init.pp index 3f2a523..179b4d8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -93,12 +93,21 @@ class apt { "puppet:///modules/apt/02show_upgraded"] } - apt_conf { "03clean": - source => ["puppet:///modules/site-apt/${fqdn}/03clean", - "puppet:///modules/site-apt/03clean", - "puppet:///modules/apt/03clean"] + if ( $virtual == "vserver" ) { + apt_conf { "03clean_vserver": + source => ["puppet:///modules/site-apt/${fqdn}/03clean_vserver", + "puppet:///modules/site-apt/03clean_vserver", + "puppet:///modules/apt/03clean_vserver"] + } } - + else { + apt_conf { "03clean": + source => ["puppet:///modules/site-apt/${fqdn}/03clean", + "puppet:///modules/site-apt/03clean", + "puppet:///modules/apt/03clean"] + } + } + case $custom_preferences { false: { include apt::preferences::absent |