Commit 21bd0b78 authored by Philippe Pepiot's avatar Philippe Pepiot Committed by Denis Laxalde
Browse files

In non wsgi mode, use cubicweb-ctl pyramid

Always install a pyramid.ini file and if wsgi mode (uwsgi) is disabled,
use 'cubicweb-ctl pyramid -D <instance>' to start the instance.
parent f9f545ca
......@@ -10,7 +10,6 @@ include:
- template: jinja
{% endfor %}
{% if saemref.instance.wsgi %}
/home/{{ saemref.instance.user }}/etc/cubicweb.d/{{ saemref.instance.name }}/pyramid.ini:
file.managed:
- source: salt://saemref/files/pyramid.ini
......@@ -18,6 +17,7 @@ include:
- user: {{ saemref.instance.user }}
- group: {{ saemref.instance.user }}
{% if saemref.instance.wsgi %}
/home/{{ saemref.instance.user }}/etc/cubicweb.d/{{ saemref.instance.name }}/uwsgi.ini:
file.managed:
- source: salt://saemref/files/uwsgi.ini
......
......@@ -3,7 +3,7 @@
{% if saemref.instance.wsgi -%}
command=uwsgi --ini /home/{{ saemref.instance.user }}/etc/cubicweb.d/{{ saemref.instance.name }}/uwsgi.ini
{% else -%}
command=/home/{{ saemref.instance.user }}/venv/bin/cubicweb-ctl start -D {{ saemref.instance.name }}
command=/home/{{ saemref.instance.user }}/venv/bin/cubicweb-ctl pyramid -D {{ saemref.instance.name }}
{% endif -%}
user={{ saemref.instance.user }}
redirect_stderr=true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment