Merge remote-tracking branch 'github/pull/617'

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

diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb
index ccb3508be195e7f54329aedb66e63258089e9f32..17bb6339ecf4bf2e4aa5324a6c5c518ee85598da 100644 (file)
--- a/cookbooks/ssl/recipes/default.rb
+++ b/cookbooks/ssl/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: ssl
+# Cookbook:: ssl

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -20,15 +20,9 @@
 package "openssl"
 package "ssl-cert"
 
 package "openssl"
 package "ssl-cert"
 

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

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

-  mode 0o444
+  mode "444"

   backup false
 end
   backup false
 end

-
-openssl_dhparam "/etc/ssl/certs/dhparam.pem" do
-  owner "root"
-  group "root"
-  mode 0o444
-end