From 2bcb1be83bc63f068a2fe477748b57b852cde8b4 Mon Sep 17 00:00:00 2001 From: Nico Kadel-Garcia Date: Tue, 16 Dec 2014 10:51:22 -0500 Subject: [PATCH] Set all notifies that are not ':immediately' to be ':delayed', to avoid mid-deployment reloads. --- recipes/authorized_ips.rb | 2 +- recipes/commons_conf.rb | 4 ++-- recipes/http_realip_module.rb | 2 +- recipes/http_stub_status_module.rb | 2 +- recipes/naxsi_module.rb | 2 +- recipes/passenger.rb | 2 +- recipes/socketproxy.rb | 2 +- recipes/source.rb | 2 +- recipes/upload_progress_module.rb | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes/authorized_ips.rb b/recipes/authorized_ips.rb index 416b03746..d6949aecf 100644 --- a/recipes/authorized_ips.rb +++ b/recipes/authorized_ips.rb @@ -28,5 +28,5 @@ owner 'root' group node['root_group'] mode '0644' - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end diff --git a/recipes/commons_conf.rb b/recipes/commons_conf.rb index caaf7fb5d..f31746f3a 100644 --- a/recipes/commons_conf.rb +++ b/recipes/commons_conf.rb @@ -25,7 +25,7 @@ owner 'root' group node['root_group'] mode '0644' - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end template "#{node['nginx']['dir']}/sites-available/default" do @@ -33,7 +33,7 @@ owner 'root' group node['root_group'] mode '0644' - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end nginx_site 'default' do diff --git a/recipes/http_realip_module.rb b/recipes/http_realip_module.rb index bc1f95e56..6451bf9b5 100644 --- a/recipes/http_realip_module.rb +++ b/recipes/http_realip_module.rb @@ -31,7 +31,7 @@ owner 'root' group node['root_group'] mode '0644' - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end node.run_state['nginx_configure_flags'] = diff --git a/recipes/http_stub_status_module.rb b/recipes/http_stub_status_module.rb index 4e0e8d623..c07243c40 100644 --- a/recipes/http_stub_status_module.rb +++ b/recipes/http_stub_status_module.rb @@ -27,7 +27,7 @@ owner 'root' group node['root_group'] mode '0644' - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end nginx_site 'nginx_status' diff --git a/recipes/naxsi_module.rb b/recipes/naxsi_module.rb index 7d449dc40..c17722e01 100644 --- a/recipes/naxsi_module.rb +++ b/recipes/naxsi_module.rb @@ -24,7 +24,7 @@ owner 'root' group node['root_group'] mode '0644' - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end naxsi_src_filename = ::File.basename(node['nginx']['naxsi']['url']) diff --git a/recipes/passenger.rb b/recipes/passenger.rb index 8f0b6c6ef..ba35a8092 100644 --- a/recipes/passenger.rb +++ b/recipes/passenger.rb @@ -41,7 +41,7 @@ owner 'root' group node['root_group'] mode '0644' - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end node.run_state['nginx_configure_flags'] = diff --git a/recipes/socketproxy.rb b/recipes/socketproxy.rb index 52d60d663..449892241 100644 --- a/recipes/socketproxy.rb +++ b/recipes/socketproxy.rb @@ -18,7 +18,7 @@ owner 'root' group 'root' mode 00644 - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end link node['nginx']['dir'] + '/sites-enabled/socketproxy.conf' do diff --git a/recipes/source.rb b/recipes/source.rb index fdfbf0785..1911484b9 100644 --- a/recipes/source.rb +++ b/recipes/source.rb @@ -73,7 +73,7 @@ owner 'root' group node['root_group'] mode '0644' - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end # source install depends on the existence of the `tar` package diff --git a/recipes/upload_progress_module.rb b/recipes/upload_progress_module.rb index 0d5b5b3fe..ccb1cfb99 100644 --- a/recipes/upload_progress_module.rb +++ b/recipes/upload_progress_module.rb @@ -36,7 +36,7 @@ owner 'root' group node['root_group'] mode '0644' - notifies :reload, 'service[nginx]' + notifies :reload, 'service[nginx]', :delayed end bash 'extract_upload_progress_module' do