Adding the ability to disable password authentication to all the temp…

…lates.
tarnfeld · Jul 17, 2012 · 5f4df4a · 5f4df4a
1 parent 06290f2
commit 5f4df4a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/templates/centos/sshd_config.erb b/templates/centos/sshd_config.erb
@@ -1,3 +1,5 @@
+# Created by Chef.  MANUAL EDITS WILL BE OVERWRITTEN
+
 #	$OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
@@ -65,10 +67,9 @@ PermitRootLogin <%= node[:openssh][:permit_root_login] %>
 # Don't read the user's ~/.rhosts and ~/.shosts files
 #IgnoreRhosts yes
 
-# To disable tunneled clear text passwords, change to no here!
-#PasswordAuthentication yes
+# Change to no to disable tunnelled clear text passwords
+PasswordAuthentication <%= node[:openssh][:password_authentication] %>
 #PermitEmptyPasswords no
-PasswordAuthentication yes
 
 # Change to no to disable s/key passwords
 #ChallengeResponseAuthentication yes

diff --git a/templates/suse-11.0/sshd_config.erb b/templates/suse-11.0/sshd_config.erb
@@ -62,7 +62,7 @@ PermitRootLogin <%= node[:openssh][:permit_root_login] %>
 #IgnoreRhosts yes
 
 # To disable tunneled clear text passwords, change to no here!
-PasswordAuthentication no
+PasswordAuthentication <%= node[:openssh][:password_authentication] %>
 #PermitEmptyPasswords no
 
 # Change to no to disable s/key passwords

diff --git a/templates/suse-11.1/sshd_config.erb b/templates/suse-11.1/sshd_config.erb
@@ -62,7 +62,7 @@ PermitRootLogin <%= node[:openssh][:permit_root_login] %>
 #IgnoreRhosts yes
 
 # To disable tunneled clear text passwords, change to no here!
-PasswordAuthentication no
+PasswordAuthentication <%= node[:openssh][:password_authentication] %>
 #PermitEmptyPasswords no
 
 # Change to no to disable s/key passwords

diff --git a/templates/ubuntu-10.04/sshd_config.erb b/templates/ubuntu-10.04/sshd_config.erb
@@ -1,4 +1,4 @@
-# Package generated configuration file
+# Created by Chef.  MANUAL EDITS WILL BE OVERWRITTEN
 # See the sshd_config(5) manpage for details
 
 # What ports, IPs and protocols we listen for

diff --git a/templates/ubuntu-10.10/sshd_config.erb b/templates/ubuntu-10.10/sshd_config.erb
@@ -1,4 +1,4 @@
-# Package generated configuration file
+# Created by Chef.  MANUAL EDITS WILL BE OVERWRITTEN
 # See the sshd_config(5) manpage for details
 
 # What ports, IPs and protocols we listen for
@@ -51,7 +51,7 @@ PermitEmptyPasswords no
 ChallengeResponseAuthentication no
 
 # Change to no to disable tunnelled clear text passwords
-#PasswordAuthentication yes
+PasswordAuthentication <%= node[:openssh][:password_authentication] %>
 
 # Kerberos options
 #KerberosAuthentication no