X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3c507e6a6ce46fced3abc46a5220e48edbd79bbc..c05f38004a026509d99b5f2350bfeb021e44fc42:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 3490d91e1..ebcc5d783 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -29,13 +29,8 @@ package "php-pear" package "php-apc" apache_module "rewrite" - -if node[:lsb][:release].to_f >= 14.04 - apache_module "proxy" - apache_module "proxy_fcgi" -else - apache_module "fastcgi-handler" -end +apache_module "proxy" +apache_module "proxy_fcgi" home_directory = data_bag_item("accounts", "nominatim")["home"] source_directory = "#{home_directory}/nominatim" @@ -48,9 +43,7 @@ database_name = node[:nominatim][:database][:dbname] postgis_version = node[:nominatim][:database][:postgis] service "php5-fpm" do - if node[:lsb][:release].to_f >= 14.04 - provider Chef::Provider::Service::Upstart - end + provider Chef::Provider::Service::Upstart action [ :enable, :start ] supports :status => true, :restart => true, :reload => true end