projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make staticsync a module and update references
[mirror/dsa-puppet.git]
/
modules
/
ssh
/
templates
/
sshd_config.erb
diff --git
a/modules/ssh/templates/sshd_config.erb
b/modules/ssh/templates/sshd_config.erb
index
d3dff04
..
870f16f
100644
(file)
--- a/
modules/ssh/templates/sshd_config.erb
+++ b/
modules/ssh/templates/sshd_config.erb
@@
-45,17
+45,17
@@
Subsystem sftp /usr/lib/openssh/sftp-server
UsePAM yes
UsePAM yes
-AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userkeys/%u.more
+AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userkeys/%u.more
/etc/ssh/puppetkeys/%u
PasswordAuthentication no
<%=
PasswordAuthentication no
<%=
- allnodeinfo = scope.lookupvar('
site
::allnodeinfo')
+ allnodeinfo = scope.lookupvar('
deprecated
::allnodeinfo')
out = ''
out = ''
- settings = ' Banner "You are coming from a debian.org host."'
+ settings = '
#
Banner "You are coming from a debian.org host."'
allnodeinfo.keys.sort.each do |node|
next unless allnodeinfo[node].has_key?('ipHostNumber')
allnodeinfo.keys.sort.each do |node|
next unless allnodeinfo[node].has_key?('ipHostNumber')
- out += "Match Address "
+ out += "
#
Match Address "
out += allnodeinfo[node]['ipHostNumber'].collect do |ipnum|
if ipnum =~ /:/
"#{ipnum}/128"
out += allnodeinfo[node]['ipHostNumber'].collect do |ipnum|
if ipnum =~ /:/
"#{ipnum}/128"