diff options
author | Simon Josi <josi@puzzle.ch> | 2010-03-29 18:19:14 +0200 |
---|---|---|
committer | Simon Josi <josi@puzzle.ch> | 2010-03-29 18:19:14 +0200 |
commit | 4e61b2b6e1fcf1b26fdcf7638cdf53a8873ba672 (patch) | |
tree | b112adf40c96f114aec615bab4d9df8486bcf36b | |
parent | 292c22d8ab092ea7bbbd8e053374fb6896155449 (diff) |
source code style
-rw-r--r-- | manifests/brokengem.pp | 17 | ||||
-rw-r--r-- | manifests/defines.pp | 9 | ||||
-rw-r--r-- | manifests/fastercsv.pp | 2 | ||||
-rw-r--r-- | manifests/init.pp | 9 | ||||
-rw-r--r-- | manifests/mysql.pp | 2 |
5 files changed, 15 insertions, 24 deletions
diff --git a/manifests/brokengem.pp b/manifests/brokengem.pp index 466a66b..7fd6080 100644 --- a/manifests/brokengem.pp +++ b/manifests/brokengem.pp @@ -1,8 +1,15 @@ -define rubygems::brokengem($source,$ensure) { - exec { "get-gem-$name": - command => "/usr/bin/wget --output-document=/tmp/$name.gem $source", +define rubygems::brokengem( + $source, + $ensure = 'present', +) { + exec{"get-gem-$name": + command => "/usr/bin/wget -O /tmp/$name.gem $source", creates => "/tmp/$name.gem", - before => Package[$name] + before => Package[$name], + } + package{$name: + ensure => $ensure, + provider => gem, + source => "/tmp/$name.gem", } - package { $name: ensure => $ensure, provider => gem, source => "/tmp/$name.gem" } } diff --git a/manifests/defines.pp b/manifests/defines.pp deleted file mode 100644 index f3456fa..0000000 --- a/manifests/defines.pp +++ /dev/null @@ -1,9 +0,0 @@ -define rubygems::package( - $ensure = 'present' -){ - package{$name: - provider => gem, - ensure => $ensure, - require => Package['rubygems'], - } -} diff --git a/manifests/fastercsv.pp b/manifests/fastercsv.pp index 860b84d..1e6c364 100644 --- a/manifests/fastercsv.pp +++ b/manifests/fastercsv.pp @@ -1,6 +1,6 @@ class rubygems::fastercsv { rubygems::brokengem{'fastercsv': - source => 'http://rubyforge.org/frs/download.php/43190/fastercsv-1.4.0.gem', ensure => present, + source => 'http://rubyforge.org/frs/download.php/43190/fastercsv-1.4.0.gem', } } diff --git a/manifests/init.pp b/manifests/init.pp index 1b55809..9f24b15 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,15 +13,8 @@ # the Free Software Foundation. # -import 'defines.pp' - class rubygems { - include rubygems::base -} - -class rubygems::base { - package { rubygems: + package{'rubygems': ensure => present } } - diff --git a/manifests/mysql.pp b/manifests/mysql.pp index 0c66851..bdfb840 100644 --- a/manifests/mysql.pp +++ b/manifests/mysql.pp @@ -1,4 +1,4 @@ class rubygems::mysql { include mysql::devel - rubygems::package{'mysql': } + rubygems::package{'mysql':} } |