Fixed deploy environment

ajgon · Apr 25, 2016 · bf843aa · bf843aa
1 parent a32b410
commit bf843aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/recipes/deploy.rb b/recipes/deploy.rb
@@ -27,7 +27,7 @@
     user node['deployer']['user'] || 'root'
     group www_group
     rollback_on_error true
-    environment framework.out[:deploy_environment]
+    environment application['environment'].merge(framework.out[:deploy_environment])
 
     keep_releases deploy[:keep_releases]
     create_dirs_before_symlink(

diff --git a/spec/unit/recipes/deploy_spec.rb b/spec/unit/recipes/deploy_spec.rb
@@ -43,6 +43,7 @@
         revision: 'master',
         scm_provider: Chef::Provider::Git,
         enable_submodules: false,
+        environment: aws_opsworks_app['environment'].merge('RAILS_ENV' => 'production'),
         ssh_wrapper: '/tmp/ssh-git-wrapper.sh',
         symlinks: {
           'system' => 'public/system',