Skip to content

Commit 4c8fca9

Browse files
committed
consolidate single supervidord config
1 parent 2c032cb commit 4c8fca9

File tree

4 files changed

+42
-78
lines changed

4 files changed

+42
-78
lines changed
Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
[supervisord]
2-
nodaemon=true
3-
user=root
4-
logfile=/dev/null
2+
logfile=/dev/stdout
53
logfile_maxbytes=0
64
pidfile=/run/supervisord.pid
5+
nodaemon=true
76

87
[program:php-fpm]
9-
command=php-fpm
10-
priority=10
11-
autostart=true
12-
autorestart=true
13-
stopasgroup=true
14-
killasgroup=true
15-
stdout_logfile=/dev/stdout
16-
stdout_logfile_maxbytes=0
17-
stderr_logfile=/dev/stderr
18-
stderr_logfile_maxbytes=0
8+
command = php-fpm
9+
priority = 10
10+
autorestart = true
11+
stopasgroup = true
12+
killasgroup = true
13+
stderr_logfile = /dev/stderr
14+
stdout_logfile = /dev/stdout
15+
stderr_logfile_maxbytes = 0
16+
stdout_logfile_maxbytes = 0
1917

2018
[program:nginx]
21-
command=nginx -g "daemon off;"
22-
priority=20
23-
autostart=true
24-
autorestart=true
25-
stopasgroup=true
26-
killasgroup=true
27-
stdout_logfile=/dev/stdout
28-
stdout_logfile_maxbytes=0
29-
stderr_logfile=/dev/stderr
30-
stderr_logfile_maxbytes=0
19+
command = nginx -g "daemon off;"
20+
priority = 20
21+
autorestart = true
22+
stopasgroup = true
23+
killasgroup = true
24+
stderr_logfile = /dev/stderr
25+
stdout_logfile = /dev/stdout
26+
stderr_logfile_maxbytes = 0
27+
stdout_logfile_maxbytes = 0

8.4-debian-nginx/supervisor.conf

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
[supervisord]
2-
nodaemon=true
3-
user=root
4-
logfile=/dev/null
2+
logfile=/dev/stdout
53
logfile_maxbytes=0
64
pidfile=/run/supervisord.pid
5+
nodaemon=true
76

87
[program:php-fpm]
9-
command=php-fpm
10-
priority=10
11-
autostart=true
12-
autorestart=true
13-
stopasgroup=true
14-
killasgroup=true
15-
stdout_logfile=/dev/stdout
16-
stdout_logfile_maxbytes=0
17-
stderr_logfile=/dev/stderr
18-
stderr_logfile_maxbytes=0
8+
command = php-fpm
9+
priority = 10
10+
autorestart = true
11+
stopasgroup = true
12+
killasgroup = true
13+
stderr_logfile = /dev/stderr
14+
stdout_logfile = /dev/stdout
15+
stderr_logfile_maxbytes = 0
16+
stdout_logfile_maxbytes = 0
1917

2018
[program:nginx]
21-
command=nginx -g "daemon off;"
22-
priority=20
23-
autostart=true
24-
autorestart=true
25-
stopasgroup=true
26-
killasgroup=true
27-
stdout_logfile=/dev/stdout
28-
stdout_logfile_maxbytes=0
29-
stderr_logfile=/dev/stderr
30-
stderr_logfile_maxbytes=0
19+
command = nginx -g "daemon off;"
20+
priority = 20
21+
autorestart = true
22+
stopasgroup = true
23+
killasgroup = true
24+
stderr_logfile = /dev/stderr
25+
stdout_logfile = /dev/stdout
26+
stderr_logfile_maxbytes = 0
27+
stdout_logfile_maxbytes = 0

fwd-template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@
562562
},
563563
{
564564
"name": "supervisor.conf",
565-
"path": "template/supervisor-conf-debian"
565+
"path": "template/supervisor-conf"
566566
}
567567
]
568568
},
@@ -589,7 +589,7 @@
589589
},
590590
{
591591
"name": "supervisor.conf",
592-
"path": "template/supervisor-conf-debian"
592+
"path": "template/supervisor-conf"
593593
}
594594
]
595595
}

template/supervisor-conf-debian.blade.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)