diff options
| author | varac <varacanero@zeromail.org> | 2013-10-11 18:04:10 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-10-11 18:04:10 +0200 |
| commit | 3952d62b25aebe935f5d0b46e25de2f87c796b2f (patch) | |
| tree | 27d3608f13ad9e545e14b40acce74591cc7f6fec /puppet/modules/site_nickserver | |
| parent | 55d866039cbfa9baa0a0d42210467050c400bbbe (diff) | |
| parent | da6cb0546f91444d8c4e059eaa99f17fafe9c5a2 (diff) | |
Merge branch 'feature/4079_dont_remove_build_packages' into develop
Diffstat (limited to 'puppet/modules/site_nickserver')
| -rw-r--r-- | puppet/modules/site_nickserver/manifests/init.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index bf0511d5..81482a55 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 @@ -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, @@ -85,8 +83,10 @@ 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'], Class['site_config::ruby::dev'] ], + notify => Service['nickserver']; } |