python::gunicorn - added template parameter

Marc Fournier · Marc Fournier · commit 884091801d1d · 2012-11-06T21:34:03.000+01:00
The idea is to be able to use a different template, in case the one
provided with the module doesn't fit the user's need.
diff --git a/README.md b/README.md
@@ -90,13 +90,16 @@ Manages Gunicorn virtual hosts.
 
 **environment** — Set ENVIRONMENT variable. Default: none
 
+**template** — Which ERB template to use. Default: python/gunicorn.erb
+
 	python::gunicorn { 'vhost':
 	  ensure      => present,
 	  virtualenv  => '/var/www/project1',
 	  mode        => 'wsgi',
 	  dir         => '/var/www/project1/current',
 	  bind        => 'unix:/tmp/gunicorn.socket',
 	  environment => 'prod',
+	  template    => 'python/gunicorn.erb',
 	}
 
 ## Authors
diff --git a/manifests/gunicorn.pp b/manifests/gunicorn.pp
@@ -25,6 +25,9 @@
 # [*environment*]
 #  Set ENVIRONMENT variable. Default: none
 #
+# [*template*]
+#  Which ERB template to use. Default: python/gunicorn.erb
+#
 # === Examples
 #
 # python::gunicorn { 'vhost':
@@ -34,6 +37,7 @@
 #   dir         => '/var/www/project1/current',
 #   bind        => 'unix:/tmp/gunicorn.socket',
 #   environment => 'prod',
+#   template    => 'python/gunicorn.erb',
 # }
 #
 # === Authors
@@ -47,6 +51,7 @@
   $dir           = false,
   $bind          = false,
   $environment   = false,
+  $template      = 'python/gunicorn.erb',
 ) {
 
   # Parameter validation
@@ -59,7 +64,7 @@
     mode    => '0644',
     owner   => 'root',
     group   => 'root',
-    content => template('python/gunicorn.erb'),
+    content => template($template),
   }
 
 }
diff --git a/tests/gunicorn.pp b/tests/gunicorn.pp
@@ -11,4 +11,5 @@
   dir         => '/var/www/project1/current',
   bind        => 'unix:/tmp/gunicorn.socket',
   environment => 'prod',
+  template    => 'python/gunicorn.erb',
 }

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@`
`11`	`11`	`dir => '/var/www/project1/current',`
`12`	`12`	`bind => 'unix:/tmp/gunicorn.socket',`
`13`	`13`	`environment => 'prod',`
	`14`	`+ template => 'python/gunicorn.erb',`
`14`	`15`	`}`