Remove a couple of requests for legacy certificates

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index 3fbeb19d5b92f87a2356cc1e98bbb1e076c2cc8e..6cfde3722739edf9c9bc32a1896eaa8143f004fb 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["openstreetmap"]
-
 include_recipe "apache::ssl"
 include_recipe "mysql"
 include_recipe "git"
@@ -78,7 +76,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