Sort ignored addresses

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index 3fbeb19d5b92f87a2356cc1e98bbb1e076c2cc8e..89eb26d57462d16fcd03b74deed59d22b8df5621 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -17,29 +17,17 @@
 # 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-curl"
-  package "php-mysql"
-  package "php-gd"
-
-  apache_module "php7.0"
-else
-  package "php5"
-  package "php5-cli"
-  package "php5-curl"
-  package "php5-mysql"
-  package "php5-gd"
-
-  apache_module "php5"
-end
+package "php"
+package "php-cli"
+package "php-curl"
+package "php-mysql"
+package "php-gd"
+
+apache_module "php7.0"
 
 apache_module "headers"
 
@@ -78,7 +66,14 @@ template "/srv/donate.openstreetmap.org/scripts/db-connect.inc.php" do
   source "db-connect.inc.php.erb"
   owner "root"
   group "donate"
-  mode 0o640
+  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