Merge "Ensure more correct ordering"
This commit is contained in:
commit
fa98599f70
|
@ -96,18 +96,18 @@ class askbot::install (
|
||||||
|
|
||||||
exec { 'pip-requirements-install':
|
exec { 'pip-requirements-install':
|
||||||
path => [ '/bin', '/sbin' , '/usr/bin', '/usr/sbin', '/usr/local/bin' ],
|
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",
|
cwd => "${dist_root}/askbot",
|
||||||
logoutput => on_failure,
|
logoutput => on_failure,
|
||||||
subscribe => Git['askbot'],
|
subscribe => Git['askbot'],
|
||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
|
require => Python::Virtualenv['/usr/askbot-env'],
|
||||||
}
|
}
|
||||||
|
|
||||||
python::pip { 'stopforumspam':
|
python::pip { 'stopforumspam':
|
||||||
ensure => present,
|
|
||||||
pkgname => 'stopforumspam',
|
pkgname => 'stopforumspam',
|
||||||
virtualenv => '/usr/askbot-env',
|
virtualenv => '/usr/askbot-env',
|
||||||
require => Python::Virtualenv['/usr/askbot-env'],
|
require => Exec[ 'pip-requirements-install' ],
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::httpd::mod::wsgi
|
include ::httpd::mod::wsgi
|
||||||
|
@ -119,7 +119,12 @@ class askbot::install (
|
||||||
logoutput => on_failure,
|
logoutput => on_failure,
|
||||||
subscribe => Git['askbot'],
|
subscribe => Git['askbot'],
|
||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
require => Exec[ 'pip-requirements-install'],
|
require => [
|
||||||
|
Python::Virtualenv['/usr/askbot-env'],
|
||||||
|
Exec[ 'pip-requirements-install' ],
|
||||||
|
Python::Pip[ 'stopforumspam' ],
|
||||||
|
Python::Pip[ 'captcha' ],
|
||||||
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue