From 4bd4dd254263003a404a1573abd50307b04057c8 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 8 Jan 2014 21:27:05 +0100
Subject: use stdlib instead of the common module

---
 manifests/dselect.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'manifests')

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 }
-- 
cgit v1.2.3


From 9d56396a0439a19dd6cd3a09a5d1a9f7d6345778 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 8 Jan 2014 21:28:42 +0100
Subject: use the new style common module

---
 manifests/init.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'manifests')

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":
-- 
cgit v1.2.3