commit acc26196bcac4dc5ce908b1667fc22c677dd97f1 Author: Karsten Loesing karsten.loesing@gmx.net Date: Mon Mar 19 14:50:01 2018 +0100

Fix specified full path of sanitized webstats.

Also fix path in convert script.

Fixes #25525. --- src/main/resources/spec/convert.sh | 2 +- src/main/resources/spec/web-server-logs.xml | 2 +- src/main/resources/web/jsps/web-server-logs.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/spec/convert.sh b/src/main/resources/spec/convert.sh index 0287416..95287e2 100755 --- a/src/main/resources/spec/convert.sh +++ b/src/main/resources/spec/convert.sh @@ -1,6 +1,6 @@ #!/bin/bash for specfile in "bridge-descriptors" "web-server-logs"; do saxon-xslt $specfile.xml rfc2629.xslt xml2rfc-topblock=no | \ - tidy -q | awk -f convert.awk > ../web/WEB-INF/$specfile.jsp + tidy -q | awk -f convert.awk > ../web/jsps/$specfile.jsp done

diff --git a/src/main/resources/spec/web-server-logs.xml b/src/main/resources/spec/web-server-logs.xml index 13cfad7..c180f8c 100644 --- a/src/main/resources/spec/web-server-logs.xml +++ b/src/main/resources/spec/web-server-logs.xml @@ -190,7 +190,7 @@ mod_log_config module</eref>.</t> <t>Sanitized log files may additionally be sorted into directories by virtual host and date as in: <list> - <t>&lt;virtual-host&gt;/YYYY/MM/&lt;virtual-host&gt;_&lt;physical-host&gt;_access.log_YYYYMMDD[.xz]</t> + <t>&lt;virtual-host&gt;/YYYY/MM/DD/&lt;virtual-host&gt;_&lt;physical-host&gt;_access.log_YYYYMMDD[.xz]</t> </list> The virtual hostnames, like 'metrics.torproject.org' or 'dist.torproject.org', are more familiar to the public and were therefore diff --git a/src/main/resources/web/jsps/web-server-logs.jsp b/src/main/resources/web/jsps/web-server-logs.jsp index 5e9cc79..8832b2a 100644 --- a/src/main/resources/web/jsps/web-server-logs.jsp +++ b/src/main/resources/web/jsps/web-server-logs.jsp @@ -277,7 +277,7 @@ of the filename.</p> by virtual host and date as in:</p> <ul class="empty"> <li> -&lt;virtual-host&gt;/YYYY/MM/&lt;virtual-host&gt;_&lt;physical-host&gt;_access.log_YYYYMMDD[.xz]</li> +&lt;virtual-host&gt;/YYYY/MM/DD/&lt;virtual-host&gt;_&lt;physical-host&gt;_access.log_YYYYMMDD[.xz]</li> </ul> <p>The virtual hostnames, like 'metrics.torproject.org' or 'dist.torproject.org', are more familiar to the public and were