Skip to content

Commit

Permalink
Added vhost option fastcgi_idle_timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
Micha Krause committed Apr 4, 2016
1 parent a291574 commit 71958f2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2098,6 +2098,10 @@ Specifies if the virtual host is present or absent. Valid options: 'absent', 'pr

Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid options must either begin with a '/' or be 'disabled'. Default: undef.

#####`fastcgi_idle_timeout`

If using fastcgi, this option sets the timeout for the server to respond.

##### `filters`

[Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters.
Expand Down
2 changes: 2 additions & 0 deletions manifests/vhost.pp
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
$fastcgi_server = undef,
$fastcgi_socket = undef,
$fastcgi_dir = undef,
$fastcgi_idle_timeout = undef,
$additional_includes = [],
$use_optional_includes = $::apache::use_optional_includes,
$apache_version = $::apache::apache_version,
Expand Down Expand Up @@ -933,6 +934,7 @@
# - $fastcgi_server
# - $fastcgi_socket
# - $fastcgi_dir
# - $fastcgi_idle_timeout
# - $apache_version
if $fastcgi_server or $fastcgi_dir {
concat::fragment { "${name}-fastcgi":
Expand Down
1 change: 1 addition & 0 deletions spec/defines/vhost_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@
'fastcgi_server' => 'localhost',
'fastcgi_socket' => '/tmp/fastcgi.socket',
'fastcgi_dir' => '/tmp',
'fastcgi_idle_timeout' => '120',
'additional_includes' => '/custom/path/includes',
'apache_version' => '2.4',
'use_optional_includes' => true,
Expand Down
3 changes: 2 additions & 1 deletion templates/vhost/_fastcgi.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<% if @fastcgi_server -%>

FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket %>
FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket -%>
<% unless @fastcgi_idle_timeout.nil? %> -idle-timeout <%= @fastcgi_idle_timeout %><% end %>
<% end -%>
<% if @fastcgi_dir -%>

Expand Down

0 comments on commit 71958f2

Please sign in to comment.