From 979cbda33c909d3bb2c7e642df6ccf70a76c1aa8 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Fri, 14 Aug 2020 11:17:47 +0100
Subject: Remove logging prefix from Nginx logs

Problem: The JSON that Nginx outputs cannot be successfully parsed by
journaldriver because Nginx prefixes it with "socrates nginx:". Adding
`nohostname` to `access_log` should solve this problem.

I borrow this from @tazjin's most recent definition of `commonHttpConfig`.
---
 nixos/socrates/configuration.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'nixos')

diff --git a/nixos/socrates/configuration.nix b/nixos/socrates/configuration.nix
index 7c0bedb83159..2fb7b5b58f89 100644
--- a/nixos/socrates/configuration.nix
+++ b/nixos/socrates/configuration.nix
@@ -168,17 +168,18 @@ in {
     commonHttpConfig = ''
       log_format json_combined escape=json
       '{'
-          '"time_local":"$time_local",'
           '"remote_addr":"$remote_addr",'
-          '"remote_user":"$remote_user",'
-          '"request":"$request",'
-          '"status": "$status",'
-          '"body_bytes_sent":"$body_bytes_sent",'
-          '"request_time":"$request_time",'
-          '"http_referrer":"$http_referer",'
-          '"http_user_agent":"$http_user_agent"'
+          '"method":"$request_method",'
+          '"uri":"$request_uri",'
+          '"status":$status,'
+          '"request_size":$request_length,'
+          '"response_size":$body_bytes_sent,'
+          '"response_time":$request_time,'
+          '"referrer":"$http_referer",'
+          '"user_agent":"$http_user_agent"'
       '}';
-      access_log syslog:server=unix:/dev/log json_combined;
+
+      access_log syslog:server=unix:/dev/log,nohostname json_combined;
     '';
 
     virtualHosts = {
-- 
cgit 1.4.1