X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a615c8af6b389f613acf1c80a7b56da48d780cc0..6782e9d4eeaf925882a000a7423afa0633948213:/cookbooks/apache/providers/conf.rb diff --git a/cookbooks/apache/providers/conf.rb b/cookbooks/apache/providers/conf.rb index beef75ea5..9b9a7a174 100644 --- a/cookbooks/apache/providers/conf.rb +++ b/cookbooks/apache/providers/conf.rb @@ -21,92 +21,59 @@ def whyrun_supported? true end +use_inline_resources + action :create do - if node[:lsb][:release].to_f >= 14.04 - create_conf - end + create_conf end action :enable do - if node[:lsb][:release].to_f >= 14.04 - enable_conf - else - create_conf - end + enable_conf end action :disable do - if node[:lsb][:release].to_f >= 14.04 - disable_conf - else - delete_conf - end + disable_conf end action :delete do - if node[:lsb][:release].to_f >= 14.04 - delete_conf - end + delete_conf end def create_conf - t = template available_name do + template available_name do cookbook new_resource.cookbook source new_resource.template owner "root" group "root" mode 0644 variables new_resource.variables - notifies :reload, "service[apache2]" if enabled? or available_name == enabled_name end - - new_resource.updated_by_last_action(t.updated_by_last_action?) end def enable_conf - l = link enabled_name do + link enabled_name do to available_name owner "root" group "root" - notifies :reload, "service[apache2]" end - - new_resource.updated_by_last_action(l.updated_by_last_action?) end def disable_conf - l = link enabled_name do + link enabled_name do action :delete - notifies :reload, "service[apache2]" end - - new_resource.updated_by_last_action(l.updated_by_last_action?) end def delete_conf - f = file available_name do + file available_name do action :delete end - - new_resource.updated_by_last_action(f.updated_by_last_action?) end def available_name - if node[:lsb][:release].to_f >= 14.04 - "/etc/apache2/conf-available/#{new_resource.name}" - else - "/etc/apache2/conf.d/#{new_resource.name}" - end + "/etc/apache2/conf-available/#{new_resource.name}.conf" end def enabled_name - if node[:lsb][:release].to_f >= 14.04 - "/etc/apache2/conf-enabled/#{new_resource.name}" - else - "/etc/apache2/conf.d/#{new_resource.name}" - end -end - -def enabled? - ::File.exists?(enabled_name) + "/etc/apache2/conf-enabled/#{new_resource.name}.conf" end