reformatted apt::ppa according to recommended

style.

removed require apt in favor of marking a
dependency.

converted release define into a class since
the resources are singletons.

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 9c277e9bd4534ec35d7859a17706e5a1616f2ec4..dd2143e246aea2e35e46bf69ba2004b29a9bec20 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,9 +1,8 @@
 # ppa.pp
 
-define apt::ppa(
+define apt::ppa() {
 
-) {
-    require apt
+  Class['apt'] -> Apt::Ppa[$title]
 
     exec { "apt-update-${name}":
         command     => "/usr/bin/aptitude update",

diff --git a/manifests/release.pp b/manifests/release.pp
index 7e00dba642e79483624272f521c6c58ee4d01332..6df52a999190ca25fa950166798f0eee023baca6 100644 (file)
--- a/manifests/release.pp
+++ b/manifests/release.pp
@@ -1,15 +1,15 @@
 # release.pp
 
-define apt::release (
-
+class apt::release (
+  $release_id
 ) {
 
                owner => root,
                group => root,
                mode => 644,
-               content => "APT::Default-Release \"${name}\";"
        }
   include apt::params
 
   file { "${apt::params::root}/apt.conf.d/01release":
+    content => "APT::Default-Release \"${release_id}\";"
 }