summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/modules/site_config/manifests/ruby.pp4
-rw-r--r--puppet/modules/site_config/manifests/ruby/dev.pp6
-rw-r--r--puppet/modules/site_nickserver/manifests/init.pp9
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp8
4 files changed, 20 insertions, 7 deletions
diff --git a/puppet/modules/site_config/manifests/ruby.pp b/puppet/modules/site_config/manifests/ruby.pp
index 2a720114..9c005032 100644
--- a/puppet/modules/site_config/manifests/ruby.pp
+++ b/puppet/modules/site_config/manifests/ruby.pp
@@ -1,6 +1,8 @@
class site_config::ruby {
Class[Ruby] -> Class[rubygems] -> Class[bundler::install]
- class { '::ruby': ruby_version => '1.9.3' }
+ class { '::ruby':
+ ruby_version => '1.9.3',
+ }
class { 'bundler::install': install_method => 'package' }
include rubygems
}
diff --git a/puppet/modules/site_config/manifests/ruby/dev.pp b/puppet/modules/site_config/manifests/ruby/dev.pp
new file mode 100644
index 00000000..dbc77ae7
--- /dev/null
+++ b/puppet/modules/site_config/manifests/ruby/dev.pp
@@ -0,0 +1,6 @@
+class site_config::ruby::dev inherits site_config::ruby {
+ Class['::ruby'] {
+ ruby_version => '1.9.3',
+ install_dev => true
+ }
+}
diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp
index bf0511d5..59613f7b 100644
--- a/puppet/modules/site_nickserver/manifests/init.pp
+++ b/puppet/modules/site_nickserver/manifests/init.pp
@@ -13,7 +13,7 @@ class site_nickserver {
tag 'leap_service'
Class['site_config::default'] -> Class['site_nickserver']
- include site_config::ruby
+ include site_config::ruby::dev
#
# VARIABLES
@@ -65,7 +65,7 @@ class site_nickserver {
#
package {
- 'libssl-dev': ensure => installed;
+ [ 'libssl-dev' ]: ensure => installed;
}
vcsrepo { '/srv/leap/nickserver':
@@ -85,8 +85,9 @@ class site_nickserver {
unless => '/usr/bin/bundle check',
user => 'nickserver',
timeout => 600,
- require => [ Class['bundler::install'], Vcsrepo['/srv/leap/nickserver'],
- Package['libssl-dev'] ],
+ require => [
+ Class['bundler::install'], Vcsrepo['/srv/leap/nickserver'],
+ Package['libssl-dev'], Package['ruby-dev'] ],
notify => Service['nickserver'];
}
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index c85a5ddc..f305f1a9 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -13,7 +13,7 @@ class site_webapp {
Class['site_config::default'] -> Class['site_webapp']
- include site_config::ruby
+ include site_config::ruby::dev
include site_webapp::apache
include site_webapp::couchdb
include site_webapp::haproxy
@@ -55,7 +55,11 @@ class site_webapp {
unless => '/usr/bin/bundle check',
user => 'leap-webapp',
timeout => 600,
- require => [ Class['bundler::install'], Vcsrepo['/srv/leap/webapp'], Service['shorewall'] ],
+ require => [
+ Class['bundler::install'],
+ Vcsrepo['/srv/leap/webapp'],
+ Package['ruby-dev'],
+ Service['shorewall'] ],
notify => Service['apache'];
}