puppet: Move environment-setting into configuration, not command.

This commit is contained in:
Alex Vandiver 2020-10-15 09:14:07 +00:00 committed by Tim Abbott
parent 3037e22f61
commit 8b0f32ee07
1 changed files with 4 additions and 2 deletions

View File

@ -25,8 +25,9 @@ directory=/home/zulip/deployments/current/
<% if @tornado_ports.length > 1 -%> <% if @tornado_ports.length > 1 -%>
[program:zulip-tornado] [program:zulip-tornado]
command=env PYTHONUNBUFFERED=1 /home/zulip/deployments/current/manage.py runtornado 127.0.0.1:98%(process_num)02d command=/home/zulip/deployments/current/manage.py runtornado 127.0.0.1:98%(process_num)02d
process_name=zulip-tornado-port-98%(process_num)02d process_name=zulip-tornado-port-98%(process_num)02d
environment=PYTHONUNBUFFERED=1
priority=200 ; the relative start priority (default 999) priority=200 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
@ -41,7 +42,8 @@ directory=/home/zulip/deployments/current/
numprocs=<%= @tornado_ports.length %> numprocs=<%= @tornado_ports.length %>
<% else -%> <% else -%>
[program:zulip-tornado] [program:zulip-tornado]
command=env PYTHONUNBUFFERED=1 /home/zulip/deployments/current/manage.py runtornado 127.0.0.1:9800 command=/home/zulip/deployments/current/manage.py runtornado 127.0.0.1:9800
environment=PYTHONUNBUFFERED=1
priority=200 ; the relative start priority (default 999) priority=200 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)