caddy: use same log format as apache

in apache frontend, we have been using:

```
LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
```

The %l is (from mod_log_config docs): Remote logname (from identd, if
supplied). This will return a dash unless mod_ident is present and
IdentityCheck is set On.

In the case of apache frontend, it was always a - . This is missing in
caddy frontend and our existing log processing tools (apachedex) cannot
be used on frontend logs since we switched to Caddy.

/reviewed-on nexedi/slapos!530

software/caddy-frontend/buildout.hash.cfg

@@ -42,7 +42,7 @@ md5sum = 38e9994be01ea1b8a379f8ff7aa05438
 
 [template-caddy-frontend-configuration]
 filename = templates/Caddyfile.in
-md5sum = d1f22ffd1567f86091e857e53afc0959
+md5sum = df8c08c9aecb48fdbcdfca40f9cf74a4
 
 [caddy-backend-url-validator]
 filename = templates/caddy-backend-url-validator.in
@@ -58,7 +58,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
 
 [template-default-slave-virtualhost]
 filename = templates/default-virtualhost.conf.in
-md5sum = add17b5d1848bee6569c028bc1aea74c
+md5sum = 4308b63820d3682511ce54040d1ae60e
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in
@@ -66,7 +66,7 @@ md5sum = 907372828d1ceb05c41240078196f439
 
 [template-log-access]
 filename = templates/template-log-access.conf.in
-md5sum = 59644acda51eb1a51eab448e6fc6aa74
+md5sum = 704f37bfdd52fe628ae81d41abba8d7a
 
 [template-empty]
 filename = templates/empty.in
@@ -90,7 +90,7 @@ md5sum = cd6bb9bd0734f17469b0ca88f8b1a531
 
 [template-nginx-configuration]
 filename = templates/nginx.cfg.in
-md5sum = d3a5ffd1020f7c7747ba5d360ecf9e72
+md5sum = 30f30ef3539fe6b7ab99162ae8e71a87
 
 [template-nginx-eventsource-slave-virtualhost]
 filename = templates/nginx-eventsource-slave.conf.in
@@ -98,7 +98,7 @@ md5sum = 217a6c801b8330b0b825f7b8b4c77184
 
 [template-nginx-notebook-slave-virtualhost]
 filename = templates/nginx-notebook-slave.conf.in
-md5sum = 82834235d2256bec4b4d62e5ba0d302e
+md5sum = ac17212a53be2c08ab84682ec665148d
 
 [template-apache-lazy-script-call]
 filename = templates/apache-lazy-script-call.sh.in

software/caddy-frontend/templates/Caddyfile.in

@@ -22,7 +22,7 @@ import {{ slave_with_cache_configuration_directory }}/*.conf
   # Compress the output
   gzip
   status 404 /
-  log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ access_log }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ error_log }} {
     * {{ not_found_file }}
   }
@@ -34,7 +34,7 @@ import {{ slave_with_cache_configuration_directory }}/*.conf
   # Compress the output
   gzip
   status 404 /
-  log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ access_log }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ error_log }} {
     * {{ not_found_file }}
   }
@@ -52,7 +52,7 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/server-status, https://{{ local_ipv
   }
   expvar
   pprof
-  log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ access_log }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ error_log }} {
     * {{ not_found_file }}
   }

software/caddy-frontend/templates/default-virtualhost.conf.in

@@ -53,7 +53,7 @@
     alpn http/1.1
 {%- endif %} {#- if enable_h2 #}
   } {# tls #}
-  log / {{ slave_parameter.get('access_log') }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ slave_parameter.get('access_log') }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ slave_parameter.get('error_log') }}
 
 {%- if not (slave_type == 'zope' and backend_url) %}
@@ -197,7 +197,7 @@
   # Compress the output
   gzip
 
-  log / {{ slave_parameter.get('access_log') }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ slave_parameter.get('access_log') }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ slave_parameter.get('error_log') }}
 
 {%- if not (slave_type == 'zope' and backend_url) %}

software/caddy-frontend/templates/nginx-notebook-slave.conf.in

@@ -23,7 +23,7 @@ https://{{ slave_parameter.get('custom_domain') }}:{{ slave_parameter['nginx_htt
   bind {{ slave_parameter['local_ipv4'] }}
   # Compress the output
   gzip
-  log / {{ slave_parameter.get('access_log') }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ slave_parameter.get('access_log') }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ slave_parameter.get('error_log') }}
 
   tls {{ ssl['certificate'] }} {{ ssl['key'] }} {
@@ -57,7 +57,7 @@ http://{{ slave_parameter.get('custom_domain') }}:{{ slave_parameter['nginx_http
   bind {{ slave_parameter['local_ipv4'] }}
   # Compress the output
   gzip
-  log / {{ slave_parameter.get('access_log') }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ slave_parameter.get('access_log') }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ slave_parameter.get('error_log') }}
 
   proxy / {{ upstream }} {

software/caddy-frontend/templates/nginx.cfg.in

@@ -76,7 +76,7 @@ import {{ slave_configuration_directory }}/*.conf
   # Serve an error 204 (No Content) for favicon.ico
   status 204 /favicon.ico
   status 404 /
-  log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ access_log }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ error_log }} {
     * {{ not_found_file }}
   }
@@ -88,7 +88,7 @@ import {{ slave_configuration_directory }}/*.conf
   # Serve an error 204 (No Content) for favicon.ico
   status 204 /favicon.ico
   status 404 /
-  log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ access_log }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ error_log }} {
     * {{ not_found_file }}
   }

software/caddy-frontend/templates/template-log-access.conf.in

@@ -9,7 +9,7 @@ https://[{{ parameter_dict['global_ipv6'] }}]:{{ parameter_dict['https_port'] }}
     "Log Access {{ slave }}"
     /
   }
-  log / {{ parameter_dict['access_log'] }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
+  log / {{ parameter_dict['access_log'] }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ parameter_dict['error_log'] }} {
     * {{ parameter_dict['not_found_file'] }}
   }

software/caddy-frontend/test/test.py

@@ -1280,7 +1280,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
         self.instance_path, '*', 'var', 'log', 'httpd', '_empty_access_log'
       ))[0]
 
-    log_regexp = r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} SOME_REMOTE_USER ' \
+    log_regexp = r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} - SOME_REMOTE_USER ' \
                  r'\[\d{2}\/.{3}\/\d{4}\:\d{2}\:\d{2}\:\d{2} \+\d{4}\] ' \
                  r'"GET \/test-path HTTP\/1.1" 404 \d+ "-" '\
                  r'"python-requests.*" \d+'