diff --git a/manifests/init.pp b/manifests/init.pp index 1a1671fb69..89f6a24cf6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,7 +14,8 @@ # class apache ( $default_mods = true, - $serveradmin = 'root@localhost' + $serveradmin = 'root@localhost', + $sendfile = false ) { include apache::params diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb index 9a9f13c5e3..5b5d963dae 100644 --- a/templates/httpd.conf.erb +++ b/templates/httpd.conf.erb @@ -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. @@ -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 %> # # ErrorLog: The location of the error log file.