X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5145c748af08a7dcae1b38deb783d74c2b550ea2..45dde9418dd342bb1a632d82559201c0b3becf1a:/cookbooks/donate/recipes/default.rb diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb index e1f64904b..1b3ede310 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,19 @@ # limitations under the License. # -node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["openstreetmap"] - -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-mysql" - package "php-gd" - - apache_module "php7.0" -else - package "php5" - package "php5-cli" - package "php5-mysql" - package "php5-gd" +package %w[ + php + php-cli + php-curl + php-mysql + php-gd +] - apache_module "php5" -end +apache_module "php7.2" apache_module "headers" @@ -72,6 +64,20 @@ directory "/srv/donate.openstreetmap.org/data" do 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