diff --git a/manifests/install.pp b/manifests/install.pp index 98ccfc0..a324cf7 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -20,24 +20,31 @@ package {$dashing::dashing_package_name: ensure => $dashing::package_status, provider => 'gem', - require => Package['rubygems'], + require => Package['rubygems-integration'], } - if !defined(Package['nodejs']) { - package {'nodejs': - ensure => installed, + if !defined(Package['rubygems-integration']) { + package {'rubygems-integration': + ensure => installed, } } + if !defined(Package['nodejs']) { + package {'nodejs': + ensure => installed, + } + } - if !defined(Package['rubygems']) { - package {'rubygems': + if !defined(Package['ruby-dev']) { + package {'ruby-dev': ensure => installed, } } - if !defined(Package['ruby-bundler']) { - package {'ruby-bundler': + if !defined(Package['bundle']) { + package {'bundle': ensure => installed, + provider => 'gem', + } } @@ -64,7 +71,7 @@ refreshonly => true, } - Package['libaugeas-ruby1.9.1'] -> Package['rubygems'] ~> Exec['update-ruby-1.9.3'] -> Package[$dashing::dashing_package_name] + Package['libaugeas-ruby1.9.1'] -> Package['bundle'] -> Package['rubygems-integration'] -> Exec['update-ruby-1.9.3'] -> Package[$dashing::dashing_package_name] } diff --git a/manifests/instance.pp b/manifests/instance.pp index 4544728..1e9628d 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -10,10 +10,10 @@ # # === Examples # -# dashing::instance {'ceph': +#dashing::instance {'ceph': # targz => 'https://github.com/rochaporto/dashing-ceph/tarball/master', # port => '3030', -# } +#} # define dashing::instance ( $targz,