Move common PHP setup logic to a new cookbook

[chef.git] / cookbooks / donate / recipes / default.rb

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index c2249ee9c4be5a38473040fe443848eb86409793..1c36bfb1e03025826bf9b18bc7c7f9631fe2fa5c 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -19,19 +19,17 @@
 
 include_recipe "accounts"
 include_recipe "apache"
 
 include_recipe "accounts"
 include_recipe "apache"

-include_recipe "mysql"

 include_recipe "git"
 include_recipe "git"

+include_recipe "mysql"
+include_recipe "php::apache"

 
 package %w[
 
 package %w[

-  php

   php-cli
   php-curl
   php-mysql
   php-gd
 ]
 
   php-cli
   php-curl
   php-mysql
   php-gd
 ]
 

-apache_module "php7.2"
-

 apache_module "headers"
 
 passwords = data_bag_item("donate", "passwords")
 apache_module "headers"
 
 passwords = data_bag_item("donate", "passwords")


@@ -55,6 +53,7 @@ end
 git "/srv/donate.openstreetmap.org" do
   action :sync
   repository "https://github.com/osmfoundation/donation-drive.git"
 git "/srv/donate.openstreetmap.org" do
   action :sync
   repository "https://github.com/osmfoundation/donation-drive.git"

+  depth 1

   user "donate"
   group "donate"
 end
   user "donate"
   group "donate"
 end