Pulling from master & capistrano changes

c-brooks · Nov 1, 2016 · 7999da6 · 7999da6
1 parent 94be4d5
commit 7999da6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -4,13 +4,15 @@ 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
 
   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