summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2018-11-15 11:46:52 +0100
committerkwadronaut <kwadronaut@leap.se>2018-11-15 11:46:52 +0100
commit12b1b489bd1b9de3fa2955af0f0d03fef0889d25 (patch)
treefbaef5b75b94d911c72aaf081cfe8fe7fa0bee35
parent118bfb9ba8fc819b99861992c93f665792f94874 (diff)
parentb8a915367794209f8432079633d054666f29e111 (diff)
Merge branch 'master' into HEADHEADmaster
-rw-r--r--manifests/init.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 25e35ff..e2d1ea8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -21,13 +21,13 @@ class apt (
$custom_key_dir = $apt::params::custom_key_dir,
) inherits apt::params {
+ include common::moduledir
+ common::module_dir { 'apt': }
+ $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
+
include apt::dot_d_directories
include apt::config
include apt::install
include apt::preferences
- include common::moduledir
- common::module_dir { 'apt': }
- $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
-
}