diff --git a/manifests/install.pp b/manifests/install.pp index d77b817..d9281e3 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -96,18 +96,18 @@ class askbot::install ( exec { 'pip-requirements-install': path => [ '/bin', '/sbin' , '/usr/bin', '/usr/sbin', '/usr/local/bin' ], - command => "/usr/askbot-env/bin/pip install -q -r ${dist_root}/askbot/askbot_requirements.txt", + command => "/usr/askbot-env/bin/pip install -r ${dist_root}/askbot/askbot_requirements.txt", cwd => "${dist_root}/askbot", logoutput => on_failure, subscribe => Git['askbot'], refreshonly => true, + require => Python::Virtualenv['/usr/askbot-env'], } python::pip { 'stopforumspam': - ensure => present, pkgname => 'stopforumspam', virtualenv => '/usr/askbot-env', - require => Python::Virtualenv['/usr/askbot-env'], + require => Exec[ 'pip-requirements-install' ], } include ::httpd::mod::wsgi @@ -119,7 +119,12 @@ class askbot::install ( logoutput => on_failure, subscribe => Git['askbot'], refreshonly => true, - require => Exec[ 'pip-requirements-install'], + require => [ + Python::Virtualenv['/usr/askbot-env'], + Exec[ 'pip-requirements-install' ], + Python::Pip[ 'stopforumspam' ], + Python::Pip[ 'captcha' ], + ], } }