new changes for deploy

renansoares
1 parent 80d63a36
Showing 2 changed files with 9 additions and 6 deletions Show diff stats
config/deploy.rb
config/nginx.conf
@@ -8,7 +8,7 @@ set :puma_threads,    [4, 16]
 set :puma_workers,    0
  
 # Default branch is :master
-ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
+# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
  
 # Don't change these unless you know what you're doing
 set :pty,             true
@@ -28,14 +28,17 @@ set :puma_init_active_record, true  # Change to false when not using ActiveRecor
  
 ## Defaults:
 # set :scm,           :git
-# set :branch,        :master
+set :branch,        :v2
 # set :format,        :pretty
 # set :log_level,     :debug
 # set :keep_releases, 5
  
 ## Linked Files & Directories (Default None):
-# set :linked_files, %w{config/database.yml}
-# set :linked_dirs,  %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
+# Default value for :linked_files is []
+set :linked_files, %w{config/database.yml .env}
+
+# Default value for linked_dirs is []
+set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
  
 namespace :puma do
   desc 'Create Directories for Puma Pids and Socket'
@@ -53,7 +56,7 @@ namespace :deploy do
   desc "Make sure local git is in sync with remote."
   task :check_revision do
     on roles(:app) do
-      unless `git rev-parse HEAD` == `git rev-parse origin/master`
+      unless `git rev-parse HEAD` == `git rev-parse origin/v2`
         puts "WARNING: HEAD is not the same as origin/master"
         puts "Run `git push` to sync changes."
         exit
  
 upstream puma {
-  server unix:///home/deployer/apps/vlibras-web2/shared/tmp/sockets/appname-puma.sock;
+  server unix:///home/deployer/apps/vlibras-web2/shared/tmp/sockets/vlibras-web2-puma.sock;
 }
  
 server {
...	...	@@ -8,7 +8,7 @@ set :puma_threads, [4, 16]
8	8	set :puma_workers, 0
9	9
10	10	# Default branch is :master
11		-ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
	11	+# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
12	12
13	13	# Don't change these unless you know what you're doing
14	14	set :pty, true
...	...	@@ -28,14 +28,17 @@ set :puma_init_active_record, true # Change to false when not using ActiveRecor
28	28
29	29	## Defaults:
30	30	# set :scm, :git
31		-# set :branch, :master
	31	+set :branch, :v2
32	32	# set :format, :pretty
33	33	# set :log_level, :debug
34	34	# set :keep_releases, 5
35	35
36	36	## Linked Files & Directories (Default None):
37		-# set :linked_files, %w{config/database.yml}
38		-# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
	37	+# Default value for :linked_files is []
	38	+set :linked_files, %w{config/database.yml .env}
	39	+
	40	+# Default value for linked_dirs is []
	41	+set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
39	42
40	43	namespace :puma do
41	44	desc 'Create Directories for Puma Pids and Socket'
...	...	@@ -53,7 +56,7 @@ namespace :deploy do
53	56	desc "Make sure local git is in sync with remote."
54	57	task :check_revision do
55	58	on roles(:app) do
56		- unless `git rev-parse HEAD` == `git rev-parse origin/master`
	59	+ unless `git rev-parse HEAD` == `git rev-parse origin/v2`
57	60	puts "WARNING: HEAD is not the same as origin/master"
58	61	puts "Run `git push` to sync changes."
59	62	exit
...	...
1	1
2	2	upstream puma {
3		- server unix:///home/deployer/apps/vlibras-web2/shared/tmp/sockets/appname-puma.sock;
	3	+ server unix:///home/deployer/apps/vlibras-web2/shared/tmp/sockets/vlibras-web2-puma.sock;
4	4	}
5	5
6	6	server {
...	...