Merge branch 'master' of https://github.com/example42/puppet-nginx

Author: javierbertoli

.project

@@ -6,7 +6,7 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
+			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -17,7 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
+		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>

Modulefile

@@ -1,5 +1,5 @@
 name 'example42-nginx'
-version '2.0.11'
+version '2.0.13'
 
 author 'Alessandro Franceschi'
 license 'Apache2'

manifests/init.pp

@@ -153,6 +153,9 @@
 #   Specified the max body size of client. Default is 10mb.
 #   Increase this param if your nginx is an upload server.
 #
+# [*sendfile*]
+#   Activate or deactivate the usage of sendfile. Default is on.
+#
 # [*service_status*]
 #   If the nginx service init script supports status argument
 #
@@ -229,6 +232,7 @@
   $keepalive_timeout   = params_lookup( 'keepalive_timeout' ),
   $client_max_body_size  = params_lookup( 'client_max_body_size' ),
   $types_hash_max_size = params_lookup( 'types_hash_max_size' ),
+  $sendfile            = params_lookup( 'sendfile' ),
   $my_class            = params_lookup( 'my_class' ),
   $source              = params_lookup( 'source' ),
   $source_dir          = params_lookup( 'source_dir' ),

manifests/params.pp

@@ -19,6 +19,7 @@
   $keepalive_timeout = 65
   $client_max_body_size = '10m'
   $types_hash_max_size = 1024
+  $sendfile = 'on'
 
   ### Application related parameters
 

templates/conf.d/nginx.conf.erb

@@ -17,7 +17,7 @@ http {
 
   access_log  <%= scope.lookupvar('nginx::log_dir')%>/access.log;
 
-  sendfile    on;
+  sendfile    <%= scope.lookupvar('nginx::sendfile')%>;
   #tcp_nopush  on;
   tcp_nodelay        on;
   client_max_body_size <%= scope.lookupvar('nginx::client_max_body_size')%>;