caddy-frontend: Implement verbose logging

software/caddy-frontend/buildout.hash.cfg

@@ -39,7 +39,7 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
 
 [template-caddy-frontend-configuration]
 filename = templates/Caddyfile.in
-md5sum = 2c9d8a41132cc5de31d09ad8af47fa22
+md5sum = 4d17c13865d1d858a9af3635ff86e683
 
 [template-custom-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
@@ -51,7 +51,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
 
 [template-default-slave-virtualhost]
 filename = templates/default-virtualhost.conf.in
-md5sum = bb80ef5a195b841a071c7104544ae776
+md5sum = 631f9e08088e12b69ba8628469cc749a
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in
@@ -59,7 +59,7 @@ md5sum = be76c0e96df722dee278077988d869a6
 
 [template-log-access]
 filename = templates/template-log-access.conf.in
-md5sum = 0867232c154e427b9e0f1af7fd694ebb
+md5sum = cbf492b2fd8a955b0f92eb512fe9163f
 
 [template-empty]
 filename = templates/empty.in

software/caddy-frontend/templates/Caddyfile.in

@@ -118,9 +118,7 @@ import {{ slave_with_cache_configuration_directory }}/*.conf
   tls {{ login_certificate }} {{ login_key }}
   bind {{ local_ipv4 }}
   status 404 /
-# TODO-Caddy   LogLevel notice
-# TODO-Caddy   LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
-  log / {{ access_log }} {combined}
+  log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ error_log }} {
     * {{ not_found_file }}
   }
@@ -135,9 +133,7 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/server-status, https://{{ local_ipv
   }
   expvar
   pprof
-# TODO-Caddy   LogLevel notice
-# TODO-Caddy   LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
-  log / {{ access_log }} {combined}
+  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

@@ -28,10 +28,7 @@
     alpn http/1.1
 {%- endif %}
   }
-# TODO-Caddy   # One Slave two logs
-# TODO-Caddy   LogLevel notice
-# TODO-Caddy   LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
-  log / {{ slave_parameter.get('access_log') }} {combined}
+  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') }}
 
 # TODO-Caddy   SSLProtocol all -SSLv2 -SSLv3
@@ -116,16 +113,12 @@
 {{ http_host_list|join(', ') }} {
   bind {{ local_ipv4 }}
 
-  log / {{ slave_parameter.get('access_log') }} {combined}
+  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 disable_via_header %}
 # TODO-Caddy   Header unset Via
 {% endif -%}
-# TODO-Caddy   # One Slave two logs
-# TODO-Caddy   LogLevel notice
-# TODO-Caddy   LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
-
 # TODO-Caddy   # Remove "Secure" from cookies, as backend may be https
 # TODO-Caddy   Header edit Set-Cookie "(?i)^(.+);secure$" "$1"
 

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

@@ -8,9 +8,7 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/{{ slave }}, https://{{ local_ipv4
     "Log Access {{ slave }}"
     /
   }
-# TODO-Caddy   LogLevel notice
-# TODO-Caddy   LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
-  log / {{ access_log }} {combined}
+  log / {{ access_log }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ error_log }} {
     * {{ not_found_file }}
   }