From 2f3f96a68c3011ac185ca4f30040a173cc4e870a Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 22 Dec 2015 22:00:04 +0100 Subject: [PATCH] use distro-provided php-db instead of manually installed one --- cookbooks/nominatim/recipes/base.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb index 2e6a8c125..31bc30b27 100644 --- a/cookbooks/nominatim/recipes/base.rb +++ b/cookbooks/nominatim/recipes/base.rb @@ -26,6 +26,7 @@ package "php5-pgsql" package "php5-fpm" package "php-pear" package "php-apc" +package "php-db" apache_module "rewrite" apache_module "proxy" @@ -106,11 +107,6 @@ package "libboost-system-dev" package "libboost-filesystem-dev" package "libboost-thread-dev" -execute "php-pear-db" do - command "pear install DB" - not_if { File.exist?("/usr/share/php/DB") } -end - execute "compile_nominatim" do action :nothing command "cd #{source_directory} && ./autogen.sh && ./configure && make" -- 2.43.2