summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-21 16:44:05 +0100
committerintrigeri <intrigeri@boum.org>2010-11-21 16:44:05 +0100
commit9ab979897f62430736e4b4c06c2339f50a4edd7d (patch)
treea4f18ac2278531a857b2ecac1a3d3355a82135a1 /manifests
parentf22861e820dc2c7f638561a2704dff19810daa66 (diff)
parent3c88b19dd33b4da1f37e2c08c981ccbcbe5a45a8 (diff)
Merge commit '3c88b19dd33b4da1f37e2c08c981ccbcbe5a45a8'.
Conflicts: manifests/init.pp
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp13
1 files changed, 4 insertions, 9 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 28fea99..54b4fe4 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,
- }
-
$use_volatile = $apt_volatile_enabled ? {
'' => false,
default => $apt_volatile_enabled,
@@ -129,9 +123,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; }
@@ -159,6 +150,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",