work around sudo environment sanitizing
authorTom Clegg <tom@clinicalfuture.com>
Fri, 21 Jun 2013 16:43:26 +0000 (12:43 -0400)
committerTom Clegg <tom@clinicalfuture.com>
Fri, 21 Jun 2013 16:43:26 +0000 (12:43 -0400)
services/api/script/crunch-dispatch.rb

index fef599d7fd9f5191b4ef57a8aed1b7311dedd2e0..24595ac6af8c283a8c10d739fcb12cbaac89aa35 100755 (executable)
@@ -71,8 +71,9 @@ class Dispatcher
       end
 
       if Server::Application.config.crunch_job_user
-        cmd_args.unshift("sudo", "-u",
-                         Server::Application.config.crunch_job_user)
+        cmd_args.unshift("sudo", "-E", "-u",
+                         Server::Application.config.crunch_job_user,
+                         "PERLLIB=#{ENV['PERLLIB']}")
       end
 
       job_auth = ApiClientAuthorization.
@@ -80,7 +81,7 @@ class Dispatcher
             api_client_id: 0)
       job_auth.save
 
-      cmd_args << 'crunch-job'
+      cmd_args << ENV['CRUNCH_JOB_BIN'] || 'crunch-job'
       cmd_args << '--job-api-token'
       cmd_args << job_auth.api_token
       cmd_args << '--job'