intrigeri 2f7903bcc4 Merge remote branch 'shared/master' ... Conflicts: templates/sshd_config/Debian_squeeze.erb I always picked the shared repository version when conflicts arose. The only exception to this rule was: I kept my branch's "HostbasedUsesNameFromPacketOnly yes" in order to be consistent with existing Etch and Lenny templates. This is not the default Debian setting, but I would find it weird if a host had this setting changed by Puppet after upgrading to Squeeze. The right way to proceed would probably be to make this configurable.		2011-02-14 17:17:31 +01:00
..
CentOS.erb	Syntax fix.	2010-10-16 22:32:25 +02:00
CentOS_Final.erb	added link for lsb stuff	2008-09-29 22:41:25 +00:00
Debian_etch.erb	Syntax fix.	2010-10-16 22:32:25 +02:00
Debian_lenny.erb	"ChallengeResponseAuthentication no" was being hardcoded later in the Debian Lenny sshd_config template, even though we offer it as a variable. With this commit, the variable will actually work, rather than be overriden	2010-12-14 13:41:05 -05:00
Debian_squeeze.erb	Merge remote branch 'shared/master'	2011-02-14 17:17:31 +01:00
Gentoo.erb	Syntax fix.	2010-10-16 22:32:25 +02:00
OpenBSD.erb	Syntax fix.	2010-10-16 22:32:25 +02:00