Remove bytemark credentials from DNS scripts

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

diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb
index a3a2708c426cf81aa0b20ea8a5ef5117620d915e..674c8768d24f897f95199939a5e6e4ac65209d3b 100644 (file)
--- a/cookbooks/ssl/recipes/default.rb
+++ b/cookbooks/ssl/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: ssl
+# Cookbook:: ssl
 # 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.
 # 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,29 +17,18 @@
 # limitations under the License.
 #
 
-keys = data_bag_item("ssl", "keys")
-
 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"
-  mode 0444
+  mode 0o444
   backup false
 end
 
-cookbook_file "/etc/ssl/certs/#{node[:ssl][:certificate]}.pem" do
+openssl_dhparam "/etc/ssl/certs/dhparam.pem" do
   owner "root"
   group "root"
-  mode 0444
-  backup false
-end
-
-file "/etc/ssl/private/#{node[:ssl][:certificate]}.key" do
-  owner "root"
-  group "ssl-cert"
-  mode 0440
-  content keys[node[:ssl][:certificate]].join("\n")
-  backup false
+  mode 0o444
 end