aboutsummaryrefslogtreecommitdiff
path: root/ihatemoney
diff options
context:
space:
mode:
authorAlexis Métaireau <alexis@notmyidea.org>2018-01-05 22:36:31 +0100
committerAlexis Métaireau <alexis@notmyidea.org>2018-01-05 22:40:28 +0100
commitb581865873f62821b21c50a0f445d9c4a517b5ec (patch)
tree7b3da65c95ad5a1470ee266e0fe31d5a6f014085 /ihatemoney
parent4ab8863eb20ea75fc0b3990471a01f4874735f3c (diff)
downloadihatemoney-mirror-b581865873f62821b21c50a0f445d9c4a517b5ec.zip
ihatemoney-mirror-b581865873f62821b21c50a0f445d9c4a517b5ec.tar.gz
ihatemoney-mirror-b581865873f62821b21c50a0f445d9c4a517b5ec.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.j22
-rwxr-xr-xihatemoney/manage.py4
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 797e6c4..9982890 100755
--- a/ihatemoney/manage.py
+++ b/ihatemoney/manage.py
@@ -49,9 +49,11 @@ class ConfigTemplate(Command):
os.path.join('conf-templates/', config_file) + '.j2'
).decode('utf-8')
+ bin_path = os.path.join(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(),
))