DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5786 from betagouv/fix_deploy

Browse source 
répare le script de déploiement
This commit is contained in:
LeSim 2020-12-11 10:11:14 +01:00 • committed by GitHub
commit 33a5d74c1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
config/deploy.rb
View file

@ -13,8 +13,7 @@ SHARED_WORKER_FILE_NAME = 'i_am_a_worker'
# Advanced settings: # Advanced settings:
# forward_agent - SSH forward_agent # forward_agent - SSH forward_agent
# user - Username in the server to SSH to # user - Username in the server to SSH to
# shared_dirs, shared_files: # shared_dirs - Manually create these paths in shared/ on your server.
# - Manually create these paths in shared/ on your server.
# They will be linked in the 'deploy:link_shared_paths' step. # They will be linked in the 'deploy:link_shared_paths' step.
deploy_to = '/var/www/ds' deploy_to = '/var/www/ds'
@ -25,9 +24,6 @@ shared_dirs = [
'tmp/pids', 'tmp/pids',
'vendor/bundle' 'vendor/bundle'
] ]
shared_files = [
SHARED_WORKER_FILE_NAME
]
set :domain, ENV.fetch('domain') set :domain, ENV.fetch('domain')
set :deploy_to, deploy_to set :deploy_to, deploy_to
@ -38,17 +34,10 @@ set :branch, ENV.fetch('branch')
set :forward_agent, true set :forward_agent, true
set :user, 'ds' set :user, 'ds'
set :shared_dirs, shared_dirs set :shared_dirs, shared_dirs
set :shared_files, shared_files
set :rbenv_path, "/home/ds/.rbenv/bin/rbenv" set :rbenv_path, "/home/ds/.rbenv/bin/rbenv"
puts "Deploy to #{ENV.fetch('domain')}, branch: #{ENV.fetch('branch')}" puts "Deploy to #{ENV.fetch('domain')}, branch: #{ENV.fetch('branch')}"
def is_worker_machine?
# The presence of a file identify if a machine is a worker or not.
# This is useful in order to know whether or not to restart delayed_job
File.file?(Rails.root.join(SHARED_WORKER_FILE_NAME))
end
# This task is the environment that is loaded for most commands, such as # This task is the environment that is loaded for most commands, such as
# `mina deploy` or `mina rake`. # `mina deploy` or `mina rake`.
task :setup do task :setup do
@ -107,12 +96,14 @@ namespace :service do
desc "Restart delayed_job" desc "Restart delayed_job"
task :restart_delayed_job do task :restart_delayed_job do
if is_worker_machine? worker_file_path = File.join(deploy_to, 'shared', SHARED_WORKER_FILE_NAME)
command %{
command %{
echo "-----> Restarting delayed_job service" echo "-----> Restarting delayed_job service"
#{echo_cmd %[sudo systemctl restart delayed_job]} #{echo_cmd %[test -f #{worker_file_path} && echo 'it is a worker marchine, restarting delayed_job']}
} #{echo_cmd %[test -f #{worker_file_path} && sudo systemctl restart delayed_job]}
end #{echo_cmd %[test -f #{worker_file_path} || echo "it is not a worker marchine, #{worker_file_path} is absent"]}
}
end end
end end