From 18f614b89be97040815f46ba95677b4d69ed305f Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Mon, 30 May 2011 10:22:04 -0700 Subject: [PATCH] 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. --- manifests/ppa.pp | 5 ++--- manifests/release.pp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 9c277e9..dd2143e 100644 --- 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 7e00dba..6df52a9 100644 --- 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}\";" } -- 2.45.2