From c66b49587deccc2d803a9ac355a454da0d19d825 Mon Sep 17 00:00:00 2001
From: Nikolai B <nikolai-b@users.noreply.github.com>
Date: Tue, 10 Nov 2015 00:13:10 +0000
Subject: [PATCH] Foreman wip

---
 Vagrantfile                                   | 2 +-
 local-cookbooks/cyclescape/recipes/default.rb | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 1ff9849..772a599 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -75,7 +75,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.provision :chef_solo do |chef|
     chef.json = {
-      cyclescape: {environment: "production"}
+      cyclescape: {environment: "staging"}
     }
     chef.data_bags_path = 'data-bags'
 
diff --git a/local-cookbooks/cyclescape/recipes/default.rb b/local-cookbooks/cyclescape/recipes/default.rb
index 4814f11..2d79a6e 100644
--- a/local-cookbooks/cyclescape/recipes/default.rb
+++ b/local-cookbooks/cyclescape/recipes/default.rb
@@ -255,9 +255,8 @@
     script 'Update foreman configuration' do
       interpreter 'bash'
       cwd release_path
-      environment 'RAILS_ENV' => node['cyclescape']['environment']
       code <<-EOH
-        bundle exec foreman export upstart /etc/init -a cyclescape -u cyclescape -e .env.#{node['cyclescape']['environment']}
+        bundle exec foreman export upstart /etc/init -a cyclescape -u cyclescape -e .#{node['cyclescape']['environment']}
       EOH
       notifies :restart, 'service[cyclescape]'
     end