summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-02-20 16:15:02 -0500
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-02-20 16:15:02 -0500
commit8ed07cac2f084bfe542f4978daa783aedd7e79b4 (patch)
tree93020168f8979b317c3a7c93e2b8ec154078385a /manifests
parente3e0b46ca6039170c2d2faa8b2bebf14460679eb (diff)
parent53e78e61fefefe85939a3c3b5efcd147deebca61 (diff)
Merge branch 'master' of git://git.puppet.immerda.ch/module-apt
Conflicts: templates/Debian/sources.list.erb
Diffstat (limited to 'manifests')
-rw-r--r--manifests/dselect.pp9
-rw-r--r--manifests/init.pp3
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 2814013..0fb4f1b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -113,9 +113,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":