diff options
| author | duritong <peter.meier+github@immerda.ch> | 2015-02-18 21:06:42 +0100 |
|---|---|---|
| committer | duritong <peter.meier+github@immerda.ch> | 2015-02-18 21:06:42 +0100 |
| commit | 3fd6a9a73afb99da97a123afd3041adc05debc55 (patch) | |
| tree | ecbf21fee8e91561733eb6fdf4b44a6cf881c0db | |
| parent | 73859861b14a84293cfb2236b498c12a8357df86 (diff) | |
| parent | f3e39b3a6a8680916219fad9815d5997b05d1feb (diff) | |
Merge pull request #9 from michaelweiser/master
Fix dependency handling
| -rw-r--r-- | manifests/dependencies.pp | 6 | ||||
| -rw-r--r-- | manifests/master.pp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/manifests/dependencies.pp b/manifests/dependencies.pp index 9a4be15..b033269 100644 --- a/manifests/dependencies.pp +++ b/manifests/dependencies.pp @@ -4,11 +4,7 @@ class trocla::dependencies( $provider = gem, ) { - package { 'moneta': - ensure => present, - provider => $provider, - } - package { 'highline': + package { [ 'moneta', 'highline', 'bcrypt' ]: ensure => present, provider => $provider, } diff --git a/manifests/master.pp b/manifests/master.pp index 8bc5cd9..f7bb32f 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -7,8 +7,8 @@ # [*provider*]: Which provider to use to install your dependencies, if you # don't use the rubygems module class trocla::master ( - $install_deps = false, - $use_rubygems = true, + $install_deps = true, + $use_rubygems = false, $provider = gem, ) { |