Cleanup templates: sshd_port is guaranteed by init.pp not to be empty.

diff --git a/templates/sshd_config/CentOS.erb b/templates/sshd_config/CentOS.erb
index e1c841941a817b2db1740cdd7ca1d3d6bceb6657..9d02a3f5980d22c6745a68a150f024ff2baba031 100644 (file)
--- a/templates/sshd_config/CentOS.erb
+++ b/templates/sshd_config/CentOS.erb
@@ -16,15 +16,11 @@
 
 # only protocol 2
 Protocol 2
-<%- 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 -%>

diff --git a/templates/sshd_config/Debian_etch.erb b/templates/sshd_config/Debian_etch.erb
index 746a447ef2b6db67145cff24459bacebf592b844..9fef401451a5e18c255479c9c0e806500b61995c 100644 (file)
--- a/templates/sshd_config/Debian_etch.erb
+++ b/templates/sshd_config/Debian_etch.erb
@@ -6,15 +6,11 @@
 <%- end %>
 
 # What ports, IPs and protocols we listen for
-<%- 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 -%>

diff --git a/templates/sshd_config/Debian_lenny.erb b/templates/sshd_config/Debian_lenny.erb
index 3c3d562b7506ff1d8b9eedba9f0335dd71069d8f..4bb9c875ab9b47e72a2fa252510820c1af77c1cb 100644 (file)
--- a/templates/sshd_config/Debian_lenny.erb
+++ b/templates/sshd_config/Debian_lenny.erb
@@ -6,15 +6,11 @@
 <%- end %>
 
 # What ports, IPs and protocols we listen for
-<%- 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 -%>

diff --git a/templates/sshd_config/Debian_squeeze.erb b/templates/sshd_config/Debian_squeeze.erb
index 77eacf05670a5a22d48cd903e7693af56621fa17..0b915143b2d4ef6673000da8c0a354f567d9d3ee 100644 (file)
--- a/templates/sshd_config/Debian_squeeze.erb
+++ b/templates/sshd_config/Debian_squeeze.erb
@@ -6,15 +6,11 @@
 <%- end %>
 
 # What ports, IPs and protocols we listen for
-<%- 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 -%>

diff --git a/templates/sshd_config/Gentoo.erb b/templates/sshd_config/Gentoo.erb
index 2112f0defb67dd7a053832855821ae8a500fd627..291b2eada748431858c669354252ac7d4e57ad73 100644 (file)
--- a/templates/sshd_config/Gentoo.erb
+++ b/templates/sshd_config/Gentoo.erb
@@ -14,15 +14,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 -%>

diff --git a/templates/sshd_config/OpenBSD.erb b/templates/sshd_config/OpenBSD.erb
index 69e8afab131c548d6079d850c37d732ede699544..c0517f44dbc5286083f8b59e6c7b5c535ff3e28d 100644 (file)
--- 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 -%>