Skip to content

Commit

Permalink
MDBF-842 - NGINX logs
Browse files Browse the repository at this point in the history
By removing the logs mount, and custom logging in configs, NGINX container will now stream the default access / error logs to the standard out/err streams.
Having logging driver: journald will enable us to collect the logs via journalctl using the container tag bb-nginx.
  • Loading branch information
RazvanLiviuVarzaru committed Nov 29, 2024
1 parent d0614da commit 217933f
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ services:
- /srv/buildbot/packages:/srv/buildbot/packages:ro
- /srv/buildbot/galera_packages:/srv/buildbot/galera_packages:ro
- /srv/buildbot/helper_files:/srv/buildbot/helper_files:ro
- ./logs/nginx:/var/log/nginx
- ./certbot/www/:/var/www/certbot/:ro
- ./certbot/ssl/:/etc/nginx/ssl/:ro
environment:
Expand Down
1 change: 0 additions & 1 deletion docker-compose/generate-config.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
- /srv/buildbot/packages:/srv/buildbot/packages:ro
- /srv/buildbot/galera_packages:/srv/buildbot/galera_packages:ro
- /srv/buildbot/helper_files:/srv/buildbot/helper_files:ro
- ./logs/nginx:/var/log/nginx
- ./certbot/www/:/var/www/certbot/:ro
- ./certbot/ssl/:/etc/nginx/ssl/:ro
environment:
Expand Down
4 changes: 0 additions & 4 deletions docker-compose/nginx/templates/bb.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ server {
proxy_pass http://${NGINX_CR_HOST_WG_ADDR}
}

# logging
access_log /var/log/nginx/${NGINX_BUILDBOT_VHOST}.access.log;
error_log /var/log/nginx/${NGINX_BUILDBOT_VHOST}.error.log;

# disable logging for wsgi_dashboards/styles.css since it's generated
# somewhere and mess with fail2ban //TEMP find the root cause!
location ~ /wsgi_dashboards/styles.css* {
Expand Down
4 changes: 0 additions & 4 deletions docker-compose/nginx/templates/ci.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,4 @@ server {
autoindex on;

error_page 404 /older_builds$request_uri;

# logging
access_log /var/log/nginx/${NGINX_ARTIFACTS_VHOST}.access.log;
error_log /var/log/nginx/${NGINX_ARTIFACTS_VHOST}.error.log;
}

0 comments on commit 217933f

Please sign in to comment.