Use openssl_dhparam to create dhparam files

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

diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb
index c2e62d2288659f1adef5ab132ce5e2cdccdef5e5..ccb3508be195e7f54329aedb66e63258089e9f32 100644 (file)
--- a/cookbooks/ssl/recipes/default.rb
+++ b/cookbooks/ssl/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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,41 +17,18 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-keys = data_bag_item("ssl", "keys")
-

 package "openssl"
 package "ssl-cert"
 
 package "openssl"
 package "ssl-cert"
 

-cookbook_file "/etc/ssl/certs/rapidssl.pem" do
+cookbook_file "/etc/ssl/certs/letsencrypt.pem" do

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode 0444
+  mode 0o444

   backup false
 end
 
   backup false
 end
 

-["openstreetmap", "tile.openstreetmap", "crm.osmfoundation"].each do |certificate|
-  if node[:ssl][:certificates].include?(certificate)
-    cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
-      owner "root"
-      group "root"
-      mode 0444
-      backup false
-    end
-
-    file "/etc/ssl/private/#{certificate}.key" do
-      owner "root"
-      group "ssl-cert"
-      mode 0440
-      content keys[certificate].join("\n")
-      backup false
-    end
-  else
-    file "/etc/ssl/certs/#{certificate}.pem" do
-      action :delete
-    end
-
-    file "/etc/ssl/private/#{certificate}.key" do
-      action :delete
-    end
-  end
+openssl_dhparam "/etc/ssl/certs/dhparam.pem" do
+  owner "root"
+  group "root"
+  mode 0o444

 end
 end