From 23efb583bf565f12361e929f1a2d1fca61f4d3bb Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 16 Oct 2010 16:01:24 +0200 Subject: Cleanup templates: sshd_port is guaranteed by init.pp not to be empty. --- templates/sshd_config/OpenBSD.erb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'templates/sshd_config/OpenBSD.erb') diff --git a/templates/sshd_config/OpenBSD.erb b/templates/sshd_config/OpenBSD.erb index 69e8afa..c0517f4 100644 --- a/templates/sshd_config/OpenBSD.erb +++ b/templates/sshd_config/OpenBSD.erb @@ -12,15 +12,11 @@ <%= sshd_head_additional_options %> <%- end %> -<%- unless sshd_port.to_s.empty? then -%> <%- if sshd_port.to_s == 'off' then -%> #Port -- disabled by puppet <% else -%> Port <%= sshd_port -%> <% end -%> -<%- else -%> -Port 22 -<%- end -%> # Use these options to restrict which interfaces/protocols sshd will bind to <% for address in sshd_listen_address -%> -- cgit v1.2.3 From a643172a794c9a1ff7602e9b4d3b220867684f54 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 16 Oct 2010 16:05:00 +0200 Subject: New option sshd_ports that obsoletes sshd_port. Backward compatibility is preserved. --- templates/sshd_config/OpenBSD.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'templates/sshd_config/OpenBSD.erb') diff --git a/templates/sshd_config/OpenBSD.erb b/templates/sshd_config/OpenBSD.erb index c0517f4..3d57097 100644 --- a/templates/sshd_config/OpenBSD.erb +++ b/templates/sshd_config/OpenBSD.erb @@ -12,11 +12,13 @@ <%= sshd_head_additional_options %> <%- end %> -<%- 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 -%> +<%- end -%> # Use these options to restrict which interfaces/protocols sshd will bind to <% for address in sshd_listen_address -%> -- cgit v1.2.3 From 8cb562f87cf5a74ffb62e1fad8e5f6d200f723ab Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 16 Oct 2010 22:32:25 +0200 Subject: Syntax fix. --- templates/sshd_config/OpenBSD.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/sshd_config/OpenBSD.erb') diff --git a/templates/sshd_config/OpenBSD.erb b/templates/sshd_config/OpenBSD.erb index 3d57097..51662d3 100644 --- a/templates/sshd_config/OpenBSD.erb +++ b/templates/sshd_config/OpenBSD.erb @@ -16,7 +16,7 @@ <%- if port.to_s == 'off' then -%> #Port -- disabled by puppet <% else -%> -Port <%= port -%> +Port <%= port %> <% end -%> <%- end -%> -- cgit v1.2.3