summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/ruby.pp4
-rw-r--r--puppet/modules/site_nickserver/manifests/init.pp7
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp2
3 files changed, 5 insertions, 8 deletions
diff --git a/puppet/modules/site_config/manifests/ruby.pp b/puppet/modules/site_config/manifests/ruby.pp
index 9c005032..2a720114 100644
--- a/puppet/modules/site_config/manifests/ruby.pp
+++ b/puppet/modules/site_config/manifests/ruby.pp
@@ -1,8 +1,6 @@
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_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp
index 59613f7b..81482a55 100644
--- a/puppet/modules/site_nickserver/manifests/init.pp
+++ b/puppet/modules/site_nickserver/manifests/init.pp
@@ -64,9 +64,7 @@ class site_nickserver {
# before EventMachine gem is built/installed.
#
- package {
- [ 'libssl-dev' ]: ensure => installed;
- }
+ package { 'libssl-dev': ensure => installed }
vcsrepo { '/srv/leap/nickserver':
ensure => present,
@@ -87,7 +85,8 @@ class site_nickserver {
timeout => 600,
require => [
Class['bundler::install'], Vcsrepo['/srv/leap/nickserver'],
- Package['libssl-dev'], Package['ruby-dev'] ],
+ Package['libssl-dev'], Class['site_config::ruby::dev'] ],
+
notify => Service['nickserver'];
}
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index f305f1a9..6c5bda4c 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -58,7 +58,7 @@ class site_webapp {
require => [
Class['bundler::install'],
Vcsrepo['/srv/leap/webapp'],
- Package['ruby-dev'],
+ Class['site_config::ruby::dev'],
Service['shorewall'] ],
notify => Service['apache'];
}