Merging master

Sergey Stankevich · Sergey Stankevich · commit 042f4eed2e15 · 2014-01-04T10:24:07.000+03:00
diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name         'stankevich-python'
-version      '1.5.0'
+version      '1.6.0'
 
 author       'Sergey Stankevich'
 license      'Apache License, Version 2.0'
diff --git a/README.md b/README.md
@@ -37,6 +37,8 @@ Installs and manages python, python-dev, python-virtualenv and Gunicorn.
 
 **gunicorn** - Install Gunicorn. Default: false
 
+**manage_gunicorn** - Allow Installation / Removal of Gunicorn. Default: true
+
 	class { 'python':
 	  version    => 'system',
 	  dev        => true,
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -21,17 +21,20 @@
 
   Python::Virtualenv <| |> -> Python::Pip <| |>
 
-  if $python::gunicorn {
-    Class['python::install'] -> Python::Gunicorn <| |>
+  if $python::manage_gunicorn {
+    if $python::gunicorn {
+      Class['python::install'] -> Python::Gunicorn <| |>
 
-    Python::Gunicorn <| |> ~> Service['gunicorn']
+      Python::Gunicorn <| |> ~> Service['gunicorn']
 
-    service { 'gunicorn':
-      ensure     => running,
-      enable     => true,
-      hasrestart => true,
-      hasstatus  => false,
-      pattern    => '/usr/bin/gunicorn',
+      service { 'gunicorn':
+        ensure     => running,
+        enable     => true,
+        hasrestart => true,
+        hasstatus  => false,
+        pattern    => '/usr/bin/gunicorn',
+      }
     }
   }
-}
+
+}
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -20,6 +20,9 @@
 # [*gunicorn*]
 #  Install Gunicorn. Default: false
 #
+# [*manage_gunicorn*]
+#  Allow Installation / Removal of Gunicorn. Default: true
+#
 # === Examples
 #
 # class { 'python':
@@ -35,12 +38,13 @@
 # Sergey Stankevich
 #
 class python (
-  $version    = 'system',
-  $pip        = false,
-  $dev        = false,
-  $virtualenv = false,
-  $gunicorn   = false,
-  $provider   = undef,
+  $version         = 'system',
+  $pip             = false,
+  $dev             = false,
+  $virtualenv      = false,
+  $gunicorn        = false,
+  $manage_gunicorn = true,
+  $provider        = undef
 ) {
 
   # Module compatibility check
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -56,11 +56,12 @@
     }
   }
 
-  $gunicorn_ensure = $python::gunicorn ? {
-    true    => present,
-    default => absent,
+  if $python::manage_gunicorn {
+    $gunicorn_ensure = $python::gunicorn ? {
+      true    => present,
+      default => absent,
+    }
+    package { 'gunicorn': ensure => $gunicorn_ensure }
   }
 
-  package { 'gunicorn': ensure => $gunicorn_ensure }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,12 @@`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- $gunicorn_ensure = $python::gunicorn ? {`
`60`		`- true => present,`
`61`		`- default => absent,`
	`59`	`+ if $python::manage_gunicorn {`
	`60`	`+ $gunicorn_ensure = $python::gunicorn ? {`
	`61`	`+ true => present,`
	`62`	`+ default => absent,`
	`63`	`+ }`
	`64`	`+ package { 'gunicorn': ensure => $gunicorn_ensure }`
`62`	`65`	`}`
`63`	`66`
`64`		`- package { 'gunicorn': ensure => $gunicorn_ensure }`
`65`		`-`
`66`	`67`	`}`