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

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 -%>

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 -%>

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 -%>

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 -%>

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 -%>

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 -%>