X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/32a423888e0d6b5254c55e4faf418b31749dc69e..22bfa5e6f8152e492f21ae2c972a164474cfdd61:/cookbooks/donate/recipes/default.rb diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb index d1b431bd7..d67ad5b8c 100644 --- a/cookbooks/donate/recipes/default.rb +++ b/cookbooks/donate/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: donate +# Cookbook:: donate # Recipe:: default # -# Copyright 2016, OpenStreetMap Foundation +# Copyright:: 2016, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # 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,18 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "apache" -include_recipe "mysql" include_recipe "git" +include_recipe "mysql" +include_recipe "php::apache-fpm" -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-cli + php-curl + php-mysql + php-gd +] apache_module "headers" @@ -61,7 +52,8 @@ end git "/srv/donate.openstreetmap.org" do action :sync - repository "git://github.com/osmfoundation/donation-drive.git" + repository "https://github.com/osmfoundation/donation-drive.git" + depth 1 user "donate" group "donate" end