Merge remote-tracking branch 'origin/master' into trunk

This commit is contained in:
root 2018-02-22 13:31:28 -08:00
commit 8603e1b2e5
2 changed files with 6 additions and 0 deletions

View File

@ -1,3 +1,6 @@
[supervisord]
nodaemon = true
[program:nginx] [program:nginx]
command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf
auto_start = true auto_start = true

View File

@ -1,3 +1,6 @@
[supervisord]
nodaemon = true
[program:nginx] [program:nginx]
command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf
auto_start = true auto_start = true