diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-19 18:08:02 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-19 18:08:02 -0200 |
| commit | 474b23271d7c4f3b82ca2e7888225e74f87ae7a8 (patch) | |
| tree | b2b58dacd66a40f5d27a381439d91006339da5b8 /templates/sshd_config/Debian_lenny.erb | |
| parent | ac30247bf9d7ea57c01cc5ad743e2788f6e8ea0d (diff) | |
| parent | e0d3cdbd36bf1d06984240da216b4492efc4e69d (diff) | |
Merge branch 'master' of git://labs.riseup.net/shared-sshd
Conflicts:
templates/sshd_config/Debian_squeeze.erb
Diffstat (limited to 'templates/sshd_config/Debian_lenny.erb')
| -rw-r--r-- | templates/sshd_config/Debian_lenny.erb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/templates/sshd_config/Debian_lenny.erb b/templates/sshd_config/Debian_lenny.erb index bdccec2..ea04fe6 100644 --- a/templates/sshd_config/Debian_lenny.erb +++ b/templates/sshd_config/Debian_lenny.erb @@ -6,14 +6,12 @@ <%- end %> # What ports, IPs and protocols we listen for -<%- unless sshd_port.to_s.empty? then -%> -<%- if sshd_port.to_s == 'off' then -%> +<%- sshd_ports.each do |port| -%> +<%- if port.to_s == 'off' then -%> #Port -- disabled by puppet <% else -%> -Port <%= sshd_port -%> +Port <%= port %> <% end -%> -<%- else -%> -Port 22 <%- end -%> # Use these options to restrict which interfaces/protocols sshd will bind to @@ -138,6 +136,9 @@ KeepAlive yes #Banner /etc/issue.net #ReverseMappingCheck yes +# Allow client to pass locale environment variables +AcceptEnv LANG LC_* + <%- if sshd_sftp_subsystem.to_s.empty? then %> Subsystem sftp /usr/lib/openssh/sftp-server <%- else %> |