From 1806356c5242f66dccc840fdb7fae22f2f8226f9 Mon Sep 17 00:00:00 2001 From: smarcet Date: Wed, 22 Jan 2020 13:25:10 -0300 Subject: [PATCH] Updated Build * Fix on supervisor launch script * Refactoring on docroot variable Change-Id: I65099e2ee2a0b3b153d70cb9ba6b7e96ec9baced --- manifests/init.pp | 3 ++- templates/supervisor.conf.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index aa01a36..d291998 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -63,6 +63,7 @@ class openstackid ( $email_smtp_server_user = '', $email_smtp_server_password = '', $use_db_seeding = false, + $projectroot = '/srv/openstackid/w', $docroot = '/srv/openstackid/w/public', $laravel_version = 4, $app_log_level = 'error', @@ -579,7 +580,7 @@ class openstackid ( cron { 'InstallLaravelSchedule': ensure => 'present', - command => 'php /srv/openstackid/w/artisan schedule:run >> /dev/null 2>&1', + command => "php ${projectroot}/artisan schedule:run >> /dev/null 2>&1", user => 'www-data', minute => '*', } diff --git a/templates/supervisor.conf.erb b/templates/supervisor.conf.erb index 03f5b9e..f3e4703 100644 --- a/templates/supervisor.conf.erb +++ b/templates/supervisor.conf.erb @@ -5,7 +5,7 @@ user=root [program:laravel-worker] process_name=%(program_name)s_%(process_num)02d -command=php <%= @docroot %>/artisan queue:work +command=php <%= @projectroot %>/artisan queue:work autostart=true autorestart=true numprocs=8