donate: add missing redirects

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index e98e5c361063cf7f961a63386c5b6800dbb99426..66a112339f7d69dc9e9b3f39eaaf46e6776f2814 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -21,14 +21,22 @@ include_recipe "apache::ssl"
 include_recipe "mysql"
 include_recipe "git"
 
-package "php"
-package "php-cli"
-package "php-curl"
-package "php-mbstring"
-package "php-mysql"
-package "php-gd"
+if node[:lsb][:release].to_f >= 16.04
+  package "php"
+  package "php-cli"
+  package "php-mysql"
+  package "php-gd"
+
+  apache_module "php7.0"
+else
+  package "php5"
+  package "php5-cli"
+  package "php5-mysql"
+  package "php5-gd"
+
+  apache_module "php5"
+end
 
-apache_module "php7.0"
 apache_module "headers"
 
 passwords = data_bag_item("donate", "passwords")
@@ -43,6 +51,12 @@ mysql_database "donate" do
   permissions "donate@localhost" => :all
 end
 
+directory "/srv/donate.openstreetmap.org" do
+  owner "donate"
+  group "donate"
+  mode 0o755
+end
+
 git "/srv/donate.openstreetmap.org" do
   action :sync
   repository "git://github.com/osmfoundation/donation-drive.git"