Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ability to enable/disable "EnableSendFile" from base class call. #105

Merged
merged 2 commits into from
Nov 9, 2012
Merged

Ability to enable/disable "EnableSendFile" from base class call. #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4494a3c
Added support for sendfile param on Base Class (to allow you disable …
obokaman-com Oct 29, 2012
99bc56c
- Removing trailing for Puppet 2.6 compatibility and = signs alignmen…
obokaman-com Nov 1, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
#
class apache (
$default_mods = true,
$serveradmin = 'root@localhost'
$serveradmin = 'root@localhost',
$sendfile = false
) {
include apache::params

Expand Down
6 changes: 4 additions & 2 deletions templates/httpd.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ Group <%= scope.lookupvar('apache::params::group') %>
# e-mailed. This address appears on some server-generated pages, such
# as error documents. e.g. admin@your-domain.com
#
ServerAdmin <%= serveradmin %>
ServerAdmin <%= @serveradmin %>

#
# ServerName gives the name and port that the server uses to identify itself.
Expand Down Expand Up @@ -361,7 +361,9 @@ HostnameLookups Off
# filesystems. Please see
# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
#
#EnableSendfile off
<% if sendfile %>
EnableSendfile <%= @sendfile %>
<% end %>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please use @sendfile as per http://docs.puppetlabs.com/guides/templating.html#referencing-variables please? Thanks!


#
# ErrorLog: The location of the error log file.
Expand Down