瀏覽代碼

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.

Dan Bode 13 年之前
父節點
當前提交
18f614b
共有 2 個文件被更改,包括 5 次插入6 次删除
  1. 2 3
      manifests/ppa.pp
  2. 3 3
      manifests/release.pp

+ 2 - 3
manifests/ppa.pp

@@ -1,9 +1,8 @@
 # ppa.pp
 # ppa.pp
 
 
-define apt::ppa(
+define apt::ppa() {
 
 
-) {
-    require apt
+  Class['apt'] -> Apt::Ppa[$title]
 
 
     exec { "apt-update-${name}":
     exec { "apt-update-${name}":
         command     => "/usr/bin/aptitude update",
         command     => "/usr/bin/aptitude update",

+ 3 - 3
manifests/release.pp

@@ -1,15 +1,15 @@
 # release.pp
 # release.pp
 
 
-define apt::release (
-
+class apt::release (
+  $release_id
 ) {
 ) {
 
 
 		owner => root,
 		owner => root,
 		group => root,
 		group => root,
 		mode => 644,
 		mode => 644,
-		content => "APT::Default-Release \"${name}\";"
 	}
 	}
   include apt::params
   include apt::params
 
 
   file { "${apt::params::root}/apt.conf.d/01release":
   file { "${apt::params::root}/apt.conf.d/01release":
+    content => "APT::Default-Release \"${release_id}\";"
 }
 }