diff options
author | Sergey Stankevich <sergey.stankevich@gmail.com> | 2012-11-08 07:11:56 -0500 |
---|---|---|
committer | Sergey Stankevich <sergey.stankevich@gmail.com> | 2012-11-08 07:11:56 -0500 |
commit | 63b4288450a3165cbd15e04fc9480fd16ff53885 (patch) | |
tree | 9928bf7c339ec13f1d5d8bc28a857aab49fda573 | |
parent | 91b595de937e938807d942d650dde3cd5f45f2ec (diff) |
Adding pip; modifying Gunicorn template for Django
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | manifests/install.pp | 2 | ||||
-rw-r--r-- | templates/gunicorn.erb | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -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 -%> ), } |