summaryrefslogtreecommitdiff
path: root/templates/sshd_config/Gentoo.erb
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-12-10 23:15:07 +0100
committermh <mh@immerda.ch>2009-12-10 23:15:07 +0100
commitbdf7bd334ee6a6a07eb6cfab17dc9c7fc79ec1a8 (patch)
treedc1ec042b5609e9896570dcd32bd3d252cbf68f8 /templates/sshd_config/Gentoo.erb
parent81063ee57bdbdc1e888755ed74af795dfbcac611 (diff)
parent6601c382962824e7467fb00ea5a84894a901b937 (diff)
merged with riseup module, various cleaning up
Diffstat (limited to 'templates/sshd_config/Gentoo.erb')
-rw-r--r--templates/sshd_config/Gentoo.erb20
1 files changed, 14 insertions, 6 deletions
diff --git a/templates/sshd_config/Gentoo.erb b/templates/sshd_config/Gentoo.erb
index 77ed378..2112f0d 100644
--- a/templates/sshd_config/Gentoo.erb
+++ b/templates/sshd_config/Gentoo.erb
@@ -10,12 +10,20 @@
# possible, but leave them commented. Uncommented options change a
# default value.
-<%- unless sshd_port.to_s.empty? then %>
-Port <%= sshd_port %>
-<%- else %>
-Port 22
+<%- unless sshd_head_additional_options.to_s.empty? then %>
+<%= 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 -%>
ListenAddress <%= address %>
@@ -203,8 +211,8 @@ AllowGroups <%= sshd_allowed_groups %>
<%- end %>
-<%- unless sshd_additional_options.to_s.empty? then %>
-<%= sshd_additional_options %>
+<%- unless sshd_tail_additional_options.to_s.empty? then %>
+<%= sshd_tail_additional_options %>
<%- end %>