diff options
| author | varac <varacanero@zeromail.org> | 2015-11-05 13:36:01 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-11-17 19:51:11 +0100 |
| commit | 0307cc047f253a18a36a23cb128b862e113bf414 (patch) | |
| tree | 595407f64af179662e0dcb28320ca0bfff81eb25 /puppet/modules/site_config | |
| parent | 40455b8d66d2680debfa408de63533e80baee259 (diff) | |
[bug] [jessie] Don't specify ruby versions
because ruby-1.9.3 is not available on jessie.
- Related: #6920
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/ruby.pp | 12 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/ruby/dev.pp | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/puppet/modules/site_config/manifests/ruby.pp b/puppet/modules/site_config/manifests/ruby.pp index 2a720114..5c13233d 100644 --- a/puppet/modules/site_config/manifests/ruby.pp +++ b/puppet/modules/site_config/manifests/ruby.pp @@ -1,14 +1,8 @@ +# install ruby, rubygems and bundler +# configure ruby settings common to all servers class site_config::ruby { Class[Ruby] -> Class[rubygems] -> Class[bundler::install] - class { '::ruby': ruby_version => '1.9.3' } + class { '::ruby': } class { 'bundler::install': install_method => 'package' } include rubygems } - - -# -# Ruby settings common to all servers -# -# Why this way? So that other classes can do 'include site_ruby' without creating redeclaration errors. -# See https://puppetlabs.com/blog/modeling-class-composition-with-parameterized-classes/ -# diff --git a/puppet/modules/site_config/manifests/ruby/dev.pp b/puppet/modules/site_config/manifests/ruby/dev.pp index 3ea6ca96..e6eb2f8a 100644 --- a/puppet/modules/site_config/manifests/ruby/dev.pp +++ b/puppet/modules/site_config/manifests/ruby/dev.pp @@ -1,6 +1,6 @@ +# install ruby dev packages needed for building some gems class site_config::ruby::dev inherits site_config::ruby { Class['::ruby'] { - ruby_version => '1.9.3', install_dev => true } # building gems locally probably requires build-essential and gcc: |