diff options
author | Jarl Stefansson <jarl@sdelements.com> | 2013-12-13 15:51:45 -0500 |
---|---|---|
committer | Jarl Stefansson <jarl@sdelements.com> | 2013-12-13 15:51:45 -0500 |
commit | 6c6d58a0f3f286ae7994cc54c05416c7efd6b87a (patch) | |
tree | 195a672b6a550b7735c81db9b1db5d72c88c1f1d /templates/gunicorn.erb | |
parent | f7801a4b0d9ae58187891d124c21d269eae19ba5 (diff) | |
parent | 44ea60543b37ce5ddb9ff9b7411dbf7a0330f0e6 (diff) |
Merge branch 'master' of github.com:jalli/puppet-python
Conflicts:
manifests/pip.pp
manifests/requirements.pp
manifests/virtualenv.pp
Diffstat (limited to 'templates/gunicorn.erb')
-rw-r--r-- | templates/gunicorn.erb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/templates/gunicorn.erb b/templates/gunicorn.erb index 1a96531..99481e7 100644 --- a/templates/gunicorn.erb +++ b/templates/gunicorn.erb @@ -1,36 +1,36 @@ CONFIG = { -<% if mode == 'django' -%> +<% if @mode == 'django' -%> 'mode': 'django', <% else -%> 'mode': 'wsgi', <% end -%> -<% if virtualenv -%> +<% if @virtualenv -%> 'environment': { -<% if environment -%> - 'ENVIRONMENT': '<%= environment %>', +<% if @environment -%> + 'ENVIRONMENT': '<%= @environment %>', <% end -%> - 'PYTHONPATH': '<%= virtualenv %>' + 'PYTHONPATH': '<%= @virtualenv %>' }, <% end -%> - 'working_dir': '<%= dir %>', + 'working_dir': '<%= @dir %>', 'user': 'www-data', 'group': 'www-data', -<% if virtualenv -%> - 'python': '<%= virtualenv %>/bin/python', +<% if @virtualenv -%> + 'python': '<%= @virtualenv %>/bin/python', <% else -%> 'python': '/usr/bin/python', <% end -%> 'args': ( -<% if !virtualenv and !bind -%> - '--bind=unix:/tmp/gunicorn-<%= name %>.socket', -<% elsif virtualenv and !bind -%> - '--bind=unix:<%= virtualenv %>/<%= name %>.socket', +<% if !@virtualenv and !@bind -%> + '--bind=unix:/tmp/gunicorn-<%= @name %>.socket', +<% elsif @virtualenv and !@bind -%> + '--bind=unix:<%= @virtualenv %>/<%= @name %>.socket', <% else -%> - '--bind=<%= bind %>', + '--bind=<%= @bind %>', <% end -%> '--workers=<%= @processorcount.to_i*2 %>', '--timeout=30', -<% if mode != 'django' -%> +<% if @mode != 'django' -%> 'app:app', <% end -%> ), |