Merge 1a07d1e into 5d58452

dev-sec · Nov 8, 2016 · 4c1c408 · 4c1c408
2 parents 5d58452 + 1a07d1e
commit 4c1c408
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -78,6 +78,7 @@
 default['ssh']['use_dns']                 = nil     # sshd
 # set this to nil to let us detect the attribute based on the node platform
 default['ssh']['use_privilege_separation'] = nil
+default['ssh']['login_grace_time']         = '30s'  # sshd
 default['ssh']['max_auth_tries']           = 2      # sshd
 default['ssh']['max_sessions']             = 10     # sshd
 default['ssh']['client']['password_authentication'] = false   # ssh

diff --git a/templates/default/opensshd.conf.erb b/templates/default/opensshd.conf.erb
@@ -88,7 +88,7 @@ KexAlgorithms <%= @kex %>
 UseLogin no
 UsePrivilegeSeparation <%= @use_priv_sep %>
 PermitUserEnvironment no
-LoginGraceTime 30s
+LoginGraceTime <%= @node['ssh']['login_grace_time'] %>
 MaxAuthTries <%= @node['ssh']['max_auth_tries'] %>
 MaxSessions <%= @node['ssh']['max_sessions'] %>
 MaxStartups 10:30:100