X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/baac726bf3bd010dbbd26557b66c12dea53f7e97..065f13db39cd1d0468bca37430eebacc0be01318:/cookbooks/donate/recipes/default.rb diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb index 6cfde3722..b84b198c9 100644 --- a/cookbooks/donate/recipes/default.rb +++ b/cookbooks/donate/recipes/default.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,27 +17,19 @@ # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "mysql" include_recipe "git" -if node[:lsb][:release].to_f >= 16.04 - package "php" - package "php-cli" - package "php-curl" - package "php-mysql" - package "php-gd" - - apache_module "php7.0" -else - package "php5" - package "php5-cli" - package "php5-curl" - package "php5-mysql" - package "php5-gd" - - apache_module "php5" -end +package %w[ + php + php-cli + php-curl + php-mysql + php-gd +] + +apache_module "php7.2" apache_module "headers"