Fix php requires and reapply nominatim role to dulcy

[chef.git] / cookbooks / nominatim / recipes / base.rb

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index 242ada30d08beee1c67670738f34733893bbe582..1c550fe2bab97c6274ae963053df7a55613e6717 100644 (file)
--- a/cookbooks/nominatim/recipes/base.rb
+++ b/cookbooks/nominatim/recipes/base.rb
@@ -20,12 +20,11 @@
 include_recipe "apache::ssl"
 include_recipe "postgresql"
 
 include_recipe "apache::ssl"
 include_recipe "postgresql"
 

-package "php5"
-package "php5-cli"
-package "php5-pgsql"
-package "php5-fpm"
+package "php"
+package "php-cli"
+package "php-pgsql"
+package "php-fpm"

 package "php-pear"
 package "php-pear"

-package "php-apc"

 package "php-db"
 
 apache_module "rewrite"
 package "php-db"
 
 apache_module "rewrite"


@@ -44,20 +43,18 @@ database_name = node[:nominatim][:database][:dbname]
 
 postgis_version = node[:nominatim][:database][:postgis]
 
 
 postgis_version = node[:nominatim][:database][:postgis]
 

-service "php5-fpm" do
-  provider Chef::Provider::Service::Upstart
+service "php7.0-fpm" do

   action [:enable, :start]
   action [:enable, :start]

-  supports :status => true, :restart => true, :reload => true

 end
 
 node[:nominatim][:fpm_pools].each do |name, data|
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|

-  template "/etc/php5/fpm/pool.d/#{name}.conf" do
+  template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do

     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables data.merge(:name => name, :port => data[:port])
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables data.merge(:name => name, :port => data[:port])

-    notifies :reload, "service[php5-fpm]"
+    notifies :reload, "service[php7.0-fpm]"

   end
 end
 
   end
 end