diff options
| author | mh <mh@immerda.ch> | 2009-12-10 23:15:07 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-12-10 23:15:07 +0100 |
| commit | bdf7bd334ee6a6a07eb6cfab17dc9c7fc79ec1a8 (patch) | |
| tree | dc1ec042b5609e9896570dcd32bd3d252cbf68f8 /templates/sshd_config/CentOS.erb | |
| parent | 81063ee57bdbdc1e888755ed74af795dfbcac611 (diff) | |
| parent | 6601c382962824e7467fb00ea5a84894a901b937 (diff) | |
| download | puppet-sshd-bdf7bd334ee6a6a07eb6cfab17dc9c7fc79ec1a8.tar.gz puppet-sshd-bdf7bd334ee6a6a07eb6cfab17dc9c7fc79ec1a8.tar.bz2 | |
merged with riseup module, various cleaning up
Diffstat (limited to 'templates/sshd_config/CentOS.erb')
| -rw-r--r-- | templates/sshd_config/CentOS.erb | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/templates/sshd_config/CentOS.erb b/templates/sshd_config/CentOS.erb index fcaf4d6..a253029 100644 --- a/templates/sshd_config/CentOS.erb +++ b/templates/sshd_config/CentOS.erb @@ -10,15 +10,20 @@ # possible, but leave them commented. Uncommented options change a # default value. +<%- unless sshd_head_additional_options.to_s.empty? then %> +<%= sshd_head_additional_options %> +<%- end %> + <%- unless sshd_port.to_s.empty? then -%> -Port <%= sshd_port %> +<%- if sshd_port.to_s == 'off' then -%> +#Port -- disabled by puppet +<% else -%> +Port <%= sshd_port -%> +<% end -%> <%- else -%> -#Port 22 +Port 22 <%- end -%> -#Protocol 2,1 -Protocol 2 -#AddressFamily any # Use these options to restrict which interfaces/protocols sshd will bind to <% for address in sshd_listen_address -%> ListenAddress <%= address %> @@ -199,8 +204,6 @@ AllowUsers <%= sshd_allowed_users %> AllowGroups <%= sshd_allowed_groups %> <%- end -%> - -<%- unless sshd_additional_options.to_s.empty? then -%> -<%= sshd_additional_options %> -<%- end -%> - +<%- unless sshd_tail_additional_options.to_s.empty? then %> +<%= sshd_tail_additional_options %> +<%- end %> |