diff options
| author | Gabriel Filion <lelutin@gmail.com> | 2010-10-25 11:44:41 -0400 |
|---|---|---|
| committer | Gabriel Filion <lelutin@gmail.com> | 2010-10-25 11:44:41 -0400 |
| commit | 3c88b19dd33b4da1f37e2c08c981ccbcbe5a45a8 (patch) | |
| tree | 14aa4695144e459c241c90900e4cd931a692e49e | |
| parent | 27d5808299045ebd6f428e7d8131d11d9ab37712 (diff) | |
Remove the now unused $apt_clean variable
This variable was deprecated in favor of using a list of file sources.
to change the value of the 'clean' property, you can either define a
file '03clean' in a site-apt module, or a per-host '$fqdn/03clean' file
in the same site-apt module.
Also, move the moduledir stuff below nearer to where it's actually used.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
| -rw-r--r-- | manifests/init.pp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 695c193..ea187f3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,12 +5,6 @@ class apt { - # See README - $real_apt_clean = $apt_clean ? { - '' => 'auto', - default => $apt_clean, - } - package { apt: ensure => installed, require => undef, @@ -54,9 +48,6 @@ class apt { include apt::unattended_upgrades } - include common::moduledir - $apt_base_dir = "${common::moduledir::module_dir_path}/apt" - modules_dir { apt: } # watch apt.conf.d file { "/etc/apt/apt.conf.d": ensure => directory, checksum => mtime; } @@ -83,6 +74,10 @@ class apt { # backports uses the normal archive key now package { "debian-backports-keyring": ensure => absent } + include common::moduledir + $apt_base_dir = "${common::moduledir::module_dir_path}/apt" + modules_dir { apt: } + if $custom_key_dir { file { "${apt_base_dir}/keys.d": source => "$custom_key_dir", |