diff options
author | LeLutin <gabster@lelutin.ca> | 2017-02-24 23:27:32 +0000 |
---|---|---|
committer | LeLutin <gabster@lelutin.ca> | 2017-02-24 23:27:32 +0000 |
commit | 6739923a0f75ffc82d0822eb15636cb244b8e31f (patch) | |
tree | b76b03a4c226d47605c30f8821711d09ec2f3825 /manifests/init.pp | |
parent | 1c31ee4c7240e192fc933c934bb05ea50537bedd (diff) | |
parent | 4a261733172f2699b217ea6d43ec9ee09a32c72d (diff) |
Merge branch 'master' into 'master'
Move old monolithic preferences files to mutiple preferences.d files (Fix #14)
Closes #14
See merge request !61
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 26afaeb..25e35ff 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,6 +15,7 @@ class apt ( $volatile_url = $apt::params::volatile_url, $ubuntu_url = $apt::params::ubuntu_url, $repos = $apt::params::repos, + $manage_preferences = $apt::params::manage_preferences, $custom_preferences = $apt::params::custom_preferences, $custom_sources_list = '', $custom_key_dir = $apt::params::custom_key_dir, @@ -23,17 +24,10 @@ class 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" - case $custom_preferences { - false: { - include apt::preferences::absent - } - default: { - include apt::preferences - } - } } |