From 9a3305ea0e30ad9d4fb4b1144c1b4d25955ca6b1 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 5 Apr 2015 19:21:13 +0200 Subject: dependencies should either be managed by the package or gem --- manifests/dependencies.pp | 11 ----------- manifests/master.pp | 22 ---------------------- 2 files changed, 33 deletions(-) delete mode 100644 manifests/dependencies.pp (limited to 'manifests') diff --git a/manifests/dependencies.pp b/manifests/dependencies.pp deleted file mode 100644 index b033269..0000000 --- a/manifests/dependencies.pp +++ /dev/null @@ -1,11 +0,0 @@ -# manage trocla's dependencies -# -# [*provider*] How to install the dependencies. -class trocla::dependencies( - $provider = gem, -) { - package { [ 'moneta', 'highline', 'bcrypt' ]: - ensure => present, - provider => $provider, - } -} diff --git a/manifests/master.pp b/manifests/master.pp index 90c92b1..8ea324b 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -2,34 +2,12 @@ # # This module manages the necessary things for trocla on a master. # -# [*install_deps*]: Whether to directly install the necessary dependencies -# [*use_rubygems*]: Use the rubygems module to manage your dependencies -# [*provider*]: Which provider to use to install your dependencies, if you -# don't use the rubygems module class trocla::master ( - $install_deps = true, - $use_rubygems = false, $provider = gem, ) { - - #Select if the upstream rubygems modules should be required for install - if $use_rubygems { - require ruby::devel - require rubygems::moneta - require rubygems::highline - } - - #Manually install requirements via gem - if $install_deps { - class{'trocla::dependencies': - provider => $provider, - } - } - #Main trocla install package {'trocla': ensure => present, provider => $provider, } - } -- cgit v1.2.3