From 63b4288450a3165cbd15e04fc9480fd16ff53885 Mon Sep 17 00:00:00 2001
From: Sergey Stankevich <sergey.stankevich@gmail.com>
Date: Thu, 8 Nov 2012 07:11:56 -0500
Subject: Adding pip; modifying Gunicorn template for Django

---
 README.md              | 2 +-
 manifests/install.pp   | 2 +-
 templates/gunicorn.erb | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a7b00d5..67c9d07 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [puppet-python](https://github.com/stankevich/puppet-python)
 ======
 
-Puppet module for installing and managing python, pip, virtualenv, Gunicorn virtual hosts
+Puppet module for installing and managing python, pip, virtualenvs and Gunicorn virtual hosts.
 
 ## Usage
 
diff --git a/manifests/install.pp b/manifests/install.pp
index dec99b8..e52e7e4 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -12,7 +12,7 @@ class python::install {
     default => absent,
   }
 
-  package { "${python}-dev": ensure => $dev_ensure }
+  package { [ "${python}-dev", 'python-pip' ]: ensure => $dev_ensure }
 
   $venv_ensure = $python::virtualenv ? {
     true    => present,
diff --git a/templates/gunicorn.erb b/templates/gunicorn.erb
index 2cf3eed..1a96531 100644
--- a/templates/gunicorn.erb
+++ b/templates/gunicorn.erb
@@ -30,6 +30,8 @@ CONFIG = {
 <% end -%>
     '--workers=<%= @processorcount.to_i*2 %>',
     '--timeout=30',
+<% if mode != 'django' -%>
     'app:app',
+<% end -%>
   ),
 }
-- 
cgit v1.2.3