Skip to content

Commit

Permalink
Merge pull request #36 from bryanlatten/feature-error_logfix
Browse files Browse the repository at this point in the history
Nginx: error_log failing container
  • Loading branch information
bryanlatten authored Aug 26, 2016
2 parents 67c1793 + d893b8b commit a5a57b4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions container/root/etc/fix-attrs.d/02-tmp
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/tmp/.nginx true www-data 0644 2700
/tmp true www-data 0644 2700

# Unfortunately, even if it isn't used, it gets a lock by nginx
/var/log/nginx/error.log true www-data 0644 2700
3 changes: 2 additions & 1 deletion container/root/etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ worker_processes auto;

pid /tmp/.nginx/nginx.pid;

error_log /dev/stdout warn;

events {
# @see http://serverfault.com/questions/209014/how-can-i-observe-what-nginx-is-doing-to-solve-1024-worker-connections-are-n
worker_connections 1024;
Expand All @@ -30,7 +32,6 @@ http {

log_format minimal '$request_method $request_uri $status';

error_log /dev/stdout;
access_log /dev/stdout main;

sendfile on;
Expand Down

0 comments on commit a5a57b4

Please sign in to comment.