Commit 95c12d15 authored by Łukasz Nowak's avatar Łukasz Nowak

caddy-frontend: Log access to log-access of slaves

parent 14ea9108
...@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e ...@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg filename = instance-apache-frontend.cfg
md5sum = af5cfa38ce547668963769cad61a5ae0 md5sum = d11e5afce98dc95fa955fefc6b507261
[template-apache-replicate] [template-apache-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
...@@ -27,7 +27,7 @@ md5sum = 9e76028df7e93d3e32982884d5dc0913 ...@@ -27,7 +27,7 @@ md5sum = 9e76028df7e93d3e32982884d5dc0913
[template-slave-list] [template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = c28797d929eab286cada3a4891ba5de0 md5sum = 062cc103aa7f2b458bfea2002ca6a329
[template-slave-configuration] [template-slave-configuration]
filename = templates/custom-virtualhost.conf.in filename = templates/custom-virtualhost.conf.in
...@@ -43,7 +43,7 @@ md5sum = 70aa99bcab47d0c19737fc62d5c3dedf ...@@ -43,7 +43,7 @@ md5sum = 70aa99bcab47d0c19737fc62d5c3dedf
[template-custom-slave-list] [template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = c28797d929eab286cada3a4891ba5de0 md5sum = 062cc103aa7f2b458bfea2002ca6a329
[template-not-found-html] [template-not-found-html]
filename = templates/notfound.html filename = templates/notfound.html
...@@ -59,7 +59,7 @@ md5sum = be76c0e96df722dee278077988d869a6 ...@@ -59,7 +59,7 @@ md5sum = be76c0e96df722dee278077988d869a6
[template-log-access] [template-log-access]
filename = templates/template-log-access.conf.in filename = templates/template-log-access.conf.in
md5sum = 257cf49a61972270d8056c0bb6c3f35f md5sum = fae1e2fc29c061f7bbb455b9efb9c3b3
[template-empty] [template-empty]
filename = templates/empty.in filename = templates/empty.in
......
...@@ -199,6 +199,8 @@ extra-context = ...@@ -199,6 +199,8 @@ extra-context =
raw sixtunnel_executable ${6tunnel:location}/bin/6tunnel raw sixtunnel_executable ${6tunnel:location}/bin/6tunnel
raw service_directory $${directory:service} raw service_directory $${directory:service}
key enable_http2_by_default instance-parameter:configuration.enable-http2-by-default key enable_http2_by_default instance-parameter:configuration.enable-http2-by-default
key access_log apache-configuration:access-log
key error_log apache-configuration:error-log
[dynamic-virtualhost-template-slave] [dynamic-virtualhost-template-slave]
<= jinja2-template-base <= jinja2-template-base
......
...@@ -378,6 +378,8 @@ extra-context = ...@@ -378,6 +378,8 @@ extra-context =
raw http_port {{ http_port }} raw http_port {{ http_port }}
raw login_certificate {{ login_certificate }} raw login_certificate {{ login_certificate }}
raw login_key {{ login_key }} raw login_key {{ login_key }}
raw access_log {{ access_log }}
raw error_log {{ error_log }}
{# Publish information for the instance #} {# Publish information for the instance #}
[publish-apache-information] [publish-apache-information]
......
...@@ -8,5 +8,9 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/{{ slave }}, https://{{ local_ipv4 ...@@ -8,5 +8,9 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/{{ slave }}, https://{{ local_ipv4
"Log Access {{ slave }}" "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}
errors {{ error_log }}
} }
{% endfor %} {% endfor %}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment