diff --git a/manifests/init.pp b/manifests/init.pp index 84847e6..8b96d40 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,14 +15,7 @@ # Class: reviewday # class reviewday { - if ! defined(Package['python-launchpadlib']) { - package { 'python-launchpadlib': - ensure => present, - } - } - package { 'python-cheetah': - ensure => present, - } + file {'/var/lib/reviewday': ensure => directory, diff --git a/manifests/site.pp b/manifests/site.pp index 6d9283e..c24b9cc 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -82,6 +82,13 @@ define reviewday::site( revision => 'master', } + exec { 'install-reviewday-dependencies': + command => 'pip install -r requirements.txt', + path => '/var/lib/reviewday/reviewday', + subscribe => Vcsrepo['/var/lib/reviewday/reviewday'], + require => Class['pip'], + } + file { $httproot: ensure => directory, owner => 'reviewday', @@ -101,6 +108,7 @@ define reviewday::site( command => "cd /var/lib/reviewday/reviewday && PYTHONPATH=\$PWD flock -n /var/lib/reviewday/update.lock python bin/reviewday -o ${httproot}", minute => '*/30', user => 'reviewday', + require => Exec['install-reviewday-dependencies'], } }