diff options
| author | Alexis Métaireau <alexis@notmyidea.org> | 2018-01-05 22:36:31 +0100 |
|---|---|---|
| committer | Alexis Métaireau <alexis@notmyidea.org> | 2018-01-14 15:55:06 +0100 |
| commit | 0504fd82f52317d902e85a6e448048d5ef1c58d9 (patch) | |
| tree | 1e036664abac681a7368d94a6c3ca92036a5be2a /ihatemoney | |
| parent | 34a21616506402c764d481cc7a28e2b9818518f9 (diff) | |
| download | ihatemoney-mirror-0504fd82f52317d902e85a6e448048d5ef1c58d9.zip ihatemoney-mirror-0504fd82f52317d902e85a6e448048d5ef1c58d9.tar.gz ihatemoney-mirror-0504fd82f52317d902e85a6e448048d5ef1c58d9.tar.bz2 | |
Fix the supervisord template.
The script was relying on the presence of an environment variable, which
is only set when the virtualenv is activated. But a virtualenv does not
have to be activated to work (it's possible to call the python command
directly).
This fixes it by relying on `sys.executable` which should be correct at
all times.
Fixes #306
Diffstat (limited to 'ihatemoney')
| -rw-r--r-- | ihatemoney/conf-templates/supervisord.conf.j2 | 2 | ||||
| -rwxr-xr-x | ihatemoney/manage.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ihatemoney/conf-templates/supervisord.conf.j2 b/ihatemoney/conf-templates/supervisord.conf.j2 index fa16c0c..605f39d 100644 --- a/ihatemoney/conf-templates/supervisord.conf.j2 +++ b/ihatemoney/conf-templates/supervisord.conf.j2 @@ -1,5 +1,5 @@ [program:ihatemoney] -command={{ venv_path }}/bin/gunicorn -c /etc/ihatemoney/gunicorn.conf.py ihatemoney.wsgi:application +command={{ bin_path }}/gunicorn -c /etc/ihatemoney/gunicorn.conf.py ihatemoney.wsgi:application user=ihatemoney autostart=true autorestart=true diff --git a/ihatemoney/manage.py b/ihatemoney/manage.py index 315cfac..73bca57 100755 --- a/ihatemoney/manage.py +++ b/ihatemoney/manage.py @@ -49,9 +49,11 @@ class GenerateConfig(Command): os.path.join('conf-templates/', config_file) + '.j2' ).decode('utf-8') + bin_path = os.path.dirname(sys.executable) + print(Template(template_content).render( pkg_path=os.path.abspath(os.path.dirname(__file__)), - venv_path=os.environ.get('VIRTUAL_ENV'), + bin_path=bin_path, secret_key=self.gen_secret_key(), )) |