From 7999da63cddb84e4e820dc335734726113acbb9c Mon Sep 17 00:00:00 2001
From: Corey <c.brooks96@live.ca>
Date: Mon, 31 Oct 2016 20:49:26 -0700
Subject: [PATCH] Pulling from master & capistrano changes

---
 config/deploy/production.rb     | 2 +-
 lib/capistrano/tasks/setup.rake | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 3962460..baf1eb9 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -8,7 +8,7 @@
 # server 'db.example.com', user: 'deploy', roles: %w{db}
 
 server 'sportsello.com', user: 'deploy', roles: %w{app}
-set :branch, 'production/config'
+set :branch, 'master'
 
 
 # role-based syntax
diff --git a/lib/capistrano/tasks/setup.rake b/lib/capistrano/tasks/setup.rake
index 7a7f28e..c2c8c59 100644
--- a/lib/capistrano/tasks/setup.rake
+++ b/lib/capistrano/tasks/setup.rake
@@ -4,6 +4,7 @@ namespace :setup do
   task :upload_yml do
     on roles(:app) do
       execute "mkdir -p #{shared_path}/config"
+      execute "touch #{shared_path}/config/database.yml"
       upload! StringIO.new(File.read("config/database.yml")), "#{shared_path}/config/database.yml"
     end
   end
@@ -11,6 +12,7 @@ namespace :setup do
   desc "Upload .env.production file."
   task :upload_env do
     on roles(:app) do
+      execute "touch #{shared_path}/.env"
       upload! StringIO.new(File.read(".env.production")), "#{shared_path}/.env"
     end
   end