Merge "Fine tune nginx config"
This commit is contained in:
commit
d337a5909c
@ -65,7 +65,6 @@ COPY stx/toCOPY/aptly/aptly.conf /etc/aptly.conf
|
||||
COPY stx/toCOPY/aptly/supervisord.aptly.conf /etc/supervisor/conf.d/aptly.conf
|
||||
|
||||
# Configure Nginx
|
||||
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
|
||||
COPY stx/toCOPY/aptly/nginx.conf.template /etc/nginx/nginx.conf.template
|
||||
COPY stx/toCOPY/aptly/supervisord.nginx.conf /etc/supervisor/conf.d/nginx.conf
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
[program:nginx]
|
||||
command=/usr/sbin/nginx
|
||||
# "daemon off" should be used in Docker or under Supervisord
|
||||
command=/usr/sbin/nginx -g "daemon off;"
|
||||
redirect_stderr=true
|
||||
stdout_logfile_maxbytes=1MB
|
||||
|
Loading…
x
Reference in New Issue
Block a user