aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-05-20 23:29:41 +0000
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-05-20 23:29:41 +0000
commitb8e3c1a673fa02dbf2f1d7fa92291cc1988a8670 (patch)
tree903ed8513184efac99e717e416f5bb61d9a0f596
parent0a2bca51673067836b94d82932f9bfe094c9b1ad (diff)
parentd00986b0e0024a02ca5eb56aa493bfc8bd7ecb93 (diff)
downloadpuppet-sshd-b8e3c1a673fa02dbf2f1d7fa92291cc1988a8670.tar.gz
puppet-sshd-b8e3c1a673fa02dbf2f1d7fa92291cc1988a8670.tar.bz2
Merge branch 'debian-login-grace' into 'master'
sync LoginGraceTime with debian defaults for some reason this was 10 minutes in our module, yet 120s everywhere else. and only in wheezy too, wtf... See merge request !13
-rw-r--r--templates/sshd_config/Debian_wheezy.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/sshd_config/Debian_wheezy.erb b/templates/sshd_config/Debian_wheezy.erb
index bfa6ea8..f9a476b 100644
--- a/templates/sshd_config/Debian_wheezy.erb
+++ b/templates/sshd_config/Debian_wheezy.erb
@@ -37,7 +37,7 @@ SyslogFacility AUTH
LogLevel INFO
# Authentication:
-LoginGraceTime 600
+LoginGraceTime 120
PermitRootLogin <%= scope.lookupvar('::sshd::permit_root_login') %>
StrictModes <%= scope.lookupvar('::sshd::strict_modes') %>