Switch remaining PHP sites to use FPM

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index e1f64904b2c8ae2bacb6a7672761b31cd20c82ea..d67ad5b8cde4417e32f4570bca3c760b2d4b739b 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: donate
+# Cookbook:: donate

 # Recipe:: default
 #
 # 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
 #
 #
 # 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,
 #
 # 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.
 #
 
 # limitations under the License.
 #
 

-node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["openstreetmap"]
-
-include_recipe "apache::ssl"
-include_recipe "mysql"
+include_recipe "accounts"
+include_recipe "apache"

 include_recipe "git"
 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-mysql"
-  package "php-gd"
-
-  apache_module "php7.0"
-else
-  package "php5"
-  package "php5-cli"
-  package "php5-mysql"
-  package "php5-gd"
-
-  apache_module "php5"
-end
+package %w[
+  php-cli
+  php-curl
+  php-mysql
+  php-gd
+]

 
 apache_module "headers"
 
 
 apache_module "headers"
 


@@ -61,7 +52,8 @@ end
 
 git "/srv/donate.openstreetmap.org" do
   action :sync
 
 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
   user "donate"
   group "donate"
 end


@@ -72,6 +64,20 @@ directory "/srv/donate.openstreetmap.org/data" do
   mode 0o755
 end
 
   mode 0o755
 end
 

+template "/srv/donate.openstreetmap.org/scripts/db-connect.inc.php" do
+  source "db-connect.inc.php.erb"
+  owner "root"
+  group "donate"
+  mode 0o644
+  variables :passwords => passwords
+end
+
+ssl_certificate "donate.openstreetmap.org" do
+  domains ["donate.openstreetmap.org", "donate.openstreetmap.com",
+           "donate.openstreetmap.net", "donate.osm.org"]
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "donate.openstreetmap.org" do
   template "apache.erb"
 end
 apache_site "donate.openstreetmap.org" do
   template "apache.erb"
 end