aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-10-16 16:01:24 +0200
committerintrigeri <intrigeri@boum.org>2010-10-16 16:01:24 +0200
commit23efb583bf565f12361e929f1a2d1fca61f4d3bb (patch)
tree17a1b6983a2ef2c05082c9e0537c1d167c745e03
parent060703f6a2c40e3fc6d16c1df16be6c307c60340 (diff)
downloadpuppet-sshd-23efb583bf565f12361e929f1a2d1fca61f4d3bb.tar.gz
puppet-sshd-23efb583bf565f12361e929f1a2d1fca61f4d3bb.tar.bz2
Cleanup templates: sshd_port is guaranteed by init.pp not to be empty.
-rw-r--r--templates/sshd_config/CentOS.erb4
-rw-r--r--templates/sshd_config/Debian_etch.erb4
-rw-r--r--templates/sshd_config/Debian_lenny.erb4
-rw-r--r--templates/sshd_config/Debian_squeeze.erb4
-rw-r--r--templates/sshd_config/Gentoo.erb4
-rw-r--r--templates/sshd_config/OpenBSD.erb4
6 files changed, 0 insertions, 24 deletions
diff --git a/templates/sshd_config/CentOS.erb b/templates/sshd_config/CentOS.erb
index e1c8419..9d02a3f 100644
--- 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 746a447..9fef401 100644
--- 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 3c3d562..4bb9c87 100644
--- 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 77eacf0..0b91514 100644
--- 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 2112f0d..291b2ea 100644
--- 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 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 -%>