make ssl listen option configurable

voxpupuli · Jun 1, 2014 · 7b80b1a · 7b80b1a
1 parent ce2bd7f
commit 7b80b1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -137,6 +137,7 @@
   $ipv6_listen_options    = 'default ipv6only=on',
   $add_header             = undef,
   $ssl                    = false,
+  $ssl_listen_option      = true,
   $ssl_cert               = undef,
   $ssl_dhparam            = undef,
   $ssl_key                = undef,
@@ -219,6 +220,7 @@
   if ($ssl_cert != undef) {
     validate_string($ssl_cert)
   }
+  validate_bool($ssl_listen_option)
   if ($ssl_dhparam != undef) {
     validate_string($ssl_dhparam)
   }

diff --git a/templates/vhost/vhost_ssl_header.erb b/templates/vhost/vhost_ssl_header.erb
@@ -1,5 +1,5 @@
 server {
-  listen       <%= @listen_ip %>:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @listen_options %> <%= @listen_options %><% end %>;
+  listen       <%= @listen_ip %>:<%= @ssl_port %> <% if @ssl_listen_option %>ssl<% end %><% if @spdy == 'on' %> spdy<% end %><% if @listen_options %> <%= @listen_options %><% end %>;
   <% if @ipv6_enable && (defined? @ipaddress6) %>
   listen [<%= @ipv6_listen_ip %>]:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @ipv6_listen_options %> <%= @ipv6_listen_options %><% end %>;
   <% end %>