Merge what remains of apache::ssl into apache::default

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index 66a112339f7d69dc9e9b3f39eaaf46e6776f2814..d1b431bd782d20b310d5c303e3acefaa8e0a15dc 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -17,13 +17,14 @@
 # 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"
 
@@ -31,6 +32,7 @@ if node[:lsb][:release].to_f >= 16.04
 else
   package "php5"
   package "php5-cli"
+  package "php5-curl"
   package "php5-mysql"
   package "php5-gd"
 
@@ -64,6 +66,26 @@ git "/srv/donate.openstreetmap.org" do
   group "donate"
 end
 
+directory "/srv/donate.openstreetmap.org/data" do
+  owner "donate"
+  group "donate"
+  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