Skip to content

Commit a0baf38

Browse files
mechnicovabuhtoyarov
authored andcommitted
Fix settings (Molinos#23)
1 parent bb5b567 commit a0baf38

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Capfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ require 'capistrano/setup'
44
# Include default deployment tasks
55
require 'capistrano/deploy'
66
require 'capistrano/scm/git'
7-
require 'capistrano/sidekiq'
87
require 'capistrano/rvm'
8+
require 'capistrano/sidekiq'
99
require 'capistrano/bundler'
1010
require 'capistrano/rails'
1111
require 'capistrano/puma'

config/deploy.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set :application, 'demo_adminos'
2-
set :repo_url, "git@gitlab.molinos.ru:abuhtoyarov/demo-adminos.git"
2+
set :repo_url, "git@github.com:Molinos/adminos_example.git"
33

44
set :config_files, %w[config/database.yml .env]
55
append :linked_files, 'config/database.yml', '.env', 'config/master.key'

config/systemd/puma.service.erb

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Type = simple
77
Environment = RAILS_ENV=<%= fetch(:rails_env) %>
88
Environment = PWD=<%= current_path %>
99
WorkingDirectory = <%= current_path %>
10-
ExecStart = /home/<%= fetch(:user)} %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/puma -S <%= shared_path %>/tmp/pids/puma.state -C <%= shared_path %>/puma.rb
11-
ExecStop = /home/<%= fetch(:user)} %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/pumactl -S <%= shared_path %>/tmp/pids/puma.state -F <%= shared_path %>/puma.rb stop
12-
ExecReload = /home/<%= fetch(:user)} %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/pumactl -S <%= shared_path %>/tmp/pids/puma.state -F <%= shared_path %>/puma.rb phased-restart
10+
ExecStart = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/puma -S <%= shared_path %>/tmp/pids/puma.state -C <%= shared_path %>/puma.rb
11+
ExecStop = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/pumactl -S <%= shared_path %>/tmp/pids/puma.state -F <%= shared_path %>/puma.rb stop
12+
ExecReload = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/pumactl -S <%= shared_path %>/tmp/pids/puma.state -F <%= shared_path %>/puma.rb phased-restart
1313
User = <%= fetch(:user) %>
1414
Group = <%= fetch(:group) || fetch(:user) %>
1515
Restart = always

config/systemd/sidekiq.service.erb

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Environment = RAILS_ENV=<%= fetch(:rails_env) %>
88
Environment = PWD=<%= current_path %>
99
EnvironmentFile=/etc/environment
1010
WorkingDirectory = <%= current_path %>
11-
ExecStart = /home/<%= fetch(:user)} %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/sidekiq -e <%= fetch(:rails_env) %> -L <%= shared_path %>/log/sidekiq.log -P <%= shared_path %>/tmp/pids/sidekiq.pid
12-
ExecStop = /home/<%= fetch(:user)} %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/sidekiqctl stop <%= shared_path %>/tmp/pids/sidekiq.pid
11+
ExecStart = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/sidekiq -e <%= fetch(:rails_env) %> -L <%= shared_path %>/log/sidekiq.log -P <%= shared_path %>/tmp/pids/sidekiq.pid
12+
ExecStop = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/sidekiqctl stop <%= shared_path %>/tmp/pids/sidekiq.pid
1313
User = <%= fetch(:user) %>
1414
Group = <%= fetch(:group) || fetch(:user) %>
1515
KillMode = process

0 commit comments

Comments
 (0)