fix(appserver): passing USER and HOME environment variables to appser…

…ver process Fixes #85
ajgon · Jun 18, 2017 · 43210bc · 43210bc
1 parent 19bf034
commit 43210bc
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 40 deletions.
diff --git a/libraries/drivers_appserver_base.rb b/libraries/drivers_appserver_base.rb
@@ -129,6 +129,7 @@ def env_config(options = { source_file: nil, destination_file: nil })
       def environment
         framework = Drivers::Framework::Factory.build(context, app, options)
         app['environment'].merge(framework.out[:deploy_environment] || {})
+                          .merge('HOME' => node['deployer']['home'], 'USER' => node['deployer']['user'])
       end
     end
   end

diff --git a/libraries/drivers_worker_base.rb b/libraries/drivers_worker_base.rb
@@ -61,6 +61,7 @@ def process_count
       def environment
         framework = Drivers::Framework::Factory.build(context, app, options)
         app['environment'].merge(framework.out[:deploy_environment] || {})
+                          .merge('HOME' => node['deployer']['home'], 'USER' => node['deployer']['user'])
       end
     end
   end

diff --git a/spec/unit/recipes/configure_spec.rb b/spec/unit/recipes/configure_spec.rb
diff --git a/spec/unit/recipes/shutdown_spec.rb b/spec/unit/recipes/shutdown_spec.rb
@@ -35,15 +35,15 @@
       expect(chef_run).to(
         run_execute(
           '/bin/su - deploy -c \'cd /srv/www/dummy_project/current && ENV_VAR1="test" ' \
-          'ENV_VAR2="some data" RAILS_ENV="staging" bundle exec sidekiqctl stop ' \
-          '/srv/www/dummy_project/shared/pids/sidekiq_dummy_project-1.pid 8\''
+          'ENV_VAR2="some data" RAILS_ENV="staging" HOME="/home/deploy" USER="deploy" ' \
+          'bundle exec sidekiqctl stop /srv/www/dummy_project/shared/pids/sidekiq_dummy_project-1.pid 8\''
         )
       )
       expect(chef_run).to(
         run_execute(
           '/bin/su - deploy -c \'cd /srv/www/dummy_project/current && ENV_VAR1="test" ' \
-          'ENV_VAR2="some data" RAILS_ENV="staging" bundle exec sidekiqctl stop ' \
-          '/srv/www/dummy_project/shared/pids/sidekiq_dummy_project-2.pid 8\''
+          'ENV_VAR2="some data" RAILS_ENV="staging" HOME="/home/deploy" USER="deploy" '\
+          'bundle exec sidekiqctl stop /srv/www/dummy_project/shared/pids/sidekiq_dummy_project-2.pid 8\''
         )
       )
     end

diff --git a/test/integration/all_options/serverspec/all_options_spec.rb b/test/integration/all_options/serverspec/all_options_spec.rb
@@ -92,6 +92,8 @@
     describe file('/srv/www/dummy_project/shared/scripts/puma.service') do
       its(:content) { should include 'ENV[\'ENV_VAR1\'] = "test"' }
       its(:content) { should include 'ENV[\'RAILS_ENV\'] = "staging"' }
+      its(:content) { should include 'ENV[\'HOME\'] = "/home/deploy"' }
+      its(:content) { should include 'ENV[\'USER\'] = "deploy"' }
       its(:content) { should include 'PID_PATH="/srv/www/dummy_project/shared/pids/puma.pid"' }
       its(:content) { should include 'def puma_running?' }
     end
@@ -125,12 +127,14 @@
       its(:content) { should include 'group sidekiq_dummy_project_group' }
       its(:content) { should include 'check process sidekiq_dummy_project-1' }
       its(:content) do
-        should include 'RAILS_ENV="staging" bundle exec sidekiq -C /srv/www/dummy_project/shared/config/sidekiq_1.yml'
+        should include 'RAILS_ENV="staging" HOME="/home/deploy" USER="deploy" ' \
+                       'bundle exec sidekiq -C /srv/www/dummy_project/shared/config/sidekiq_1.yml'
       end
       its(:content) { should include 'logger -t sidekiq-dummy_project-1' }
       its(:content) { should include 'check process sidekiq_dummy_project-2' }
       its(:content) do
-        should include 'RAILS_ENV="staging" bundle exec sidekiq -C /srv/www/dummy_project/shared/config/sidekiq_2.yml'
+        should include 'RAILS_ENV="staging" HOME="/home/deploy" USER="deploy" ' \
+                       'bundle exec sidekiq -C /srv/www/dummy_project/shared/config/sidekiq_2.yml'
       end
       its(:content) { should include 'logger -t sidekiq-dummy_project-2' }
     end

diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb
@@ -78,6 +78,8 @@
     describe file('/srv/www/dummy_project/shared/scripts/puma.service') do
       its(:content) { should include 'ENV[\'ENV_VAR1\'] = "test"' }
       its(:content) { should include 'ENV[\'RAILS_ENV\'] = "production"' }
+      its(:content) { should include 'ENV[\'HOME\'] = "/home/deploy"' }
+      its(:content) { should include 'ENV[\'USER\'] = "deploy"' }
       its(:content) { should include 'PID_PATH="/srv/www/dummy_project/shared/pids/puma.pid"' }
       its(:content) { should include 'def puma_running?' }
     end

diff --git a/...egration/thin_nginx_padrino_delayed_job/serverspec/thin_nginx_padrino_delayed_job_spec.rb b/...egration/thin_nginx_padrino_delayed_job/serverspec/thin_nginx_padrino_delayed_job_spec.rb
@@ -59,6 +59,8 @@
     describe file('/srv/www/dummy_project/shared/scripts/thin.service') do
       its(:content) { should include 'ENV[\'ENV_VAR1\'] = "test"' }
       its(:content) { should include 'ENV[\'RACK_ENV\'] = "production"' }
+      its(:content) { should include 'ENV[\'HOME\'] = "/home/deploy"' }
+      its(:content) { should include 'ENV[\'USER\'] = "deploy"' }
       its(:content) { should include 'PID_PATH="/srv/www/dummy_project/shared/pids/thin.pid"' }
       its(:content) { should include 'def thin_running?' }
     end
@@ -70,15 +72,15 @@
       its(:content) { should include 'check process delayed_job_dummy_project-1' }
       its(:content) do
         should include 'RACK_ENV="production" DATABASE_URL="sqlite:///srv/www/dummy_project/shared/db/data.sqlite3" ' \
-                       'bin/delayed_job start --pid-dir=/srv/www/dummy_project/shared/pids/ -i 0 ' \
-                       '--queues=default,mailers'
+                       'HOME="/home/deploy" USER="deploy" bin/delayed_job start ' \
+                       '--pid-dir=/srv/www/dummy_project/shared/pids/ -i 0 --queues=default,mailers'
       end
       its(:content) { should include 'logger -t delayed_job-dummy_project-1' }
       its(:content) { should include 'check process delayed_job_dummy_project-2' }
       its(:content) do
         should include 'RACK_ENV="production" DATABASE_URL="sqlite:///srv/www/dummy_project/shared/db/data.sqlite3" ' \
-                       'bin/delayed_job start --pid-dir=/srv/www/dummy_project/shared/pids/ -i 1 ' \
-                       '--queues=default,mailers'
+                       'HOME="/home/deploy" USER="deploy" bin/delayed_job start ' \
+                       '--pid-dir=/srv/www/dummy_project/shared/pids/ -i 1 --queues=default,mailers'
       end
       its(:content) { should include 'logger -t delayed_job-dummy_project-2' }
     end

diff --git a/.../integration/unicorn_apache_hanami_resque/serverspec/unicorn_apache_hanami_resque_spec.rb b/.../integration/unicorn_apache_hanami_resque/serverspec/unicorn_apache_hanami_resque_spec.rb
@@ -87,6 +87,8 @@
     describe file('/srv/www/dummy_project/shared/scripts/unicorn.service') do
       its(:content) { should include 'ENV[\'ENV_VAR1\'] = "test"' }
       its(:content) { should include 'ENV[\'HANAMI_ENV\'] = "production"' }
+      its(:content) { should include 'ENV[\'HOME\'] = "/home/deploy"' }
+      its(:content) { should include 'ENV[\'USER\'] = "deploy"' }
       its(:content) { should include 'PID_PATH="/srv/www/dummy_project/shared/pids/unicorn.pid"' }
       its(:content) { should include 'def unicorn_running?' }
     end
@@ -107,14 +109,16 @@
       its(:content) { should include 'check process resque_dummy_project-1' }
       its(:content) do
         should include 'HANAMI_ENV="production" DATABASE_URL="sqlite:///srv/www/dummy_project/shared/db/data.sqlite3"' \
-                       ' QUEUE=default,mailers VERBOSE=1 PIDFILE=/srv/www/dummy_project/shared/pids/' \
+                       ' HOME="/home/deploy" USER="deploy" QUEUE=default,mailers VERBOSE=1 ' \
+                       'PIDFILE=/srv/www/dummy_project/shared/pids/' \
                        'resque_dummy_project-1.pid COUNT=3 bundle exec rake environment resque:work'
       end
       its(:content) { should include 'logger -t resque-dummy_project-1' }
       its(:content) { should include 'check process resque_dummy_project-2' }
       its(:content) do
         should include 'HANAMI_ENV="production" DATABASE_URL="sqlite:///srv/www/dummy_project/shared/db/data.sqlite3"' \
-                       ' QUEUE=default,mailers VERBOSE=1 PIDFILE=/srv/www/dummy_project/shared/pids/' \
+                       ' HOME="/home/deploy" USER="deploy" QUEUE=default,mailers VERBOSE=1 ' \
+                       'PIDFILE=/srv/www/dummy_project/shared/pids/' \
                        'resque_dummy_project-2.pid COUNT=3 bundle exec rake environment resque:work'
       end
       its(:content) { should include 'logger -t resque-dummy_project-2' }