nominatim: remove firewall http rate limiting

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

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index 08d1aded8fe3408bbcac83594f7b867859ef42de..49c890b34a42c863fa5ebe4839fbb5aa2727bbf1 100644 (file)
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -1,9 +1,9 @@
 #
 #

-# Cookbook Name:: openssh
+# Cookbook:: openssh

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

-# Copyright 2010, OpenStreetMap Foundation.
-# Copyright 2008-2009, Opscode, Inc.
+# Copyright:: 2010, OpenStreetMap Foundation.
+# Copyright:: 2008-2009, Opscode, Inc.

 #
 # 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.


@@ -41,18 +41,18 @@ hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.coll
   end
 
   keys = {
   end
 
   keys = {

-    "ssh-rsa" => node[:keys][:ssh][:host_rsa_public],        # ~FC039
-    "ssh-dss" => node[:keys][:ssh][:host_dsa_public]         # ~FC039
+    "ssh-rsa" => node[:keys][:ssh][:host_rsa_public],
+    "ssh-dss" => node[:keys][:ssh][:host_dsa_public]

   }
 
   }
 

-  if node[:keys][:ssh][:host_ecdsa_public]                   # ~FC039
-    ecdsa_type = node[:keys][:ssh][:host_ecdsa_type]         # ~FC039
+  if node[:keys][:ssh][:host_ecdsa_public]
+    ecdsa_type = node[:keys][:ssh][:host_ecdsa_type]

 
 

-    keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] # ~FC039
+    keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public]

   end
 
   end
 

-  if node[:keys][:ssh][:host_ed25519_public]                      # ~FC039
-    keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public] # ~FC039
+  if node[:keys][:ssh][:host_ed25519_public]
+    keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public]

   end
 
   Hash[
   end
 
   Hash[


@@ -85,5 +85,5 @@ firewall_rule "accept-ssh" do
   source "net"
   dest "fw"
   proto "tcp:syn"
   source "net"
   dest "fw"
   proto "tcp:syn"

-  dest_ports "ssh"
+  dest_ports node[:openssh][:port]

 end
 end