diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/dselect.pp | 9 | ||||
| -rw-r--r-- | manifests/init.pp | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/manifests/dselect.pp b/manifests/dselect.pp index 6feeb9f..2b99a43 100644 --- a/manifests/dselect.pp +++ b/manifests/dselect.pp @@ -1,9 +1,10 @@ +# manage dselect, like +# suppressing the annoying help texts class apt::dselect { - # suppress annoying help texts of dselect - line { 'dselect_expert': - file => '/etc/dpkg/dselect.cfg', - line => 'expert', + file_line { 'dselect_expert': + path => '/etc/dpkg/dselect.cfg', + line => 'expert', } package { 'dselect': ensure => installed } diff --git a/manifests/init.pp b/manifests/init.pp index 7550aaa..034d79e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -111,9 +111,8 @@ class apt( # backports uses the normal archive key now package { 'debian-backports-keyring': ensure => absent } - include common::moduledir + common::module_dir { 'apt': } $apt_base_dir = "${common::moduledir::module_dir_path}/apt" - modules_dir { 'apt': } if $custom_key_dir { file { "${apt_base_dir}/keys.d": |