Thank you, Peter.
I had an issue with step3 git wanted to know my email and my name. Did those, applied patch, the new file is 12833 bytes. I will scp to ipfire and test.
On Wed, Feb 16, 2022 at 1:24 PM Peter Müller peter.mueller@ipfire.org wrote:
Hello Paul,
thanks for your reply.
I'm not sure this patch is created correctly. I'm learning about patch so I can figure out how to apply these changes
and
test.
The actual path of the original file is: /srv/web/ipfire/cgi-bin/logs.cgi/ovpnclients.dat
Well, it depends. On an IPFire _installation_ yes. In the IPFire _source repository_, no.
the patch points to diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat but there is no cgi-bin/ under html/
Please advise or better yet, give me a short primer on how to apply the patch.
It is important (yet continues to be confusing) to understand that the paths of files found on an installed IPFire do not necessarily have to to match the paths in the Git repository of IPFire.
For example, as you already noticed, the ovpnclients.dat CGI is located in html/cgi-bin/logs.cgi/ovpnclients.dat in the Git repository. Generally speaking, the so-called LFS files (which can be found in the lfs/ directory) control which file will be copied into which location for the actual IPFire installation.
Should this be rather sketchy in theory to you, you might want to:
Clone the Git repository into a folder on your workstation:
git clone https://git.ipfire.org/pub/git/ipfire-2.x.gitChange into that folder, create a temporary branch (not strictly
required, but keeps the "master" branch clean):
cd ipfire-2.x git checkout -b temp-ovpnclients-patch
Download the patch and apply it:
wgethttps://patchwork.ipfire.org/project/ipfire/patch/20220215134027.773437-1-mi... -O ovpnclients.dat-Fix-adjusting-input-dates.patch git am ovpnclients.dat-Fix-adjusting-input-dates.patch
- Afterwards, html/cgi-bin/logs.cgi/ovpnclients.dat will look like it
should to solve the issue. You can then copy that CGI to an IPFire installation to see the changes in production:
scp html/cgi-bin/logs.cgi/ovpnclients.dat root@[IPFire FQDN/IPgoes here]:/srv/web/ipfire/cgi-bin/logs.cgi/ovpnclients.dat
No additional command on the destination machine should be necessary. Just reload the browser tab.
Sorry for the confusions caused. I hope to have helped. :-)
Thanks, and best regards, Peter Müller
Thank you, Paul
On Tue, Feb 15, 2022 at 6:40 AM Michael Tremer <
michael.tremer@ipfire.org>
wrote:
This patch changes that we no longer interpret any dates put in by the user as UTC. They used to be converted into localtime because, although they have already been in local time.
This went unnoticed since in Europe we are close (enough) to UTC that there is no significant discrepancy on the report. However, being in North America is enough to generate confusing reports.
Reported-by: Paul kairis@gmail.com Fixes: #12768 Tested-by: Jon Murphy jon.murphy@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
html/cgi-bin/logs.cgi/ovpnclients.dat | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat index 5e2c1ff49..100573214 100755 --- a/html/cgi-bin/logs.cgi/ovpnclients.dat +++ b/html/cgi-bin/logs.cgi/ovpnclients.dat @@ -115,16 +115,16 @@ my $database_query = qq( common_name, SUM( STRFTIME('%s', ( CASE
WHEN DATETIME(COALESCE(disconnected_at,CURRENT_TIMESTAMP), 'localtime') < DATETIME('$to_datestring',
'localtime',
'start of day', '+86399 seconds')
WHEN DATETIME(COALESCE(disconnected_at,CURRENT_TIMESTAMP), 'localtime') < DATETIME('$to_datestring', 'start of day', '+86399 seconds') THEN DATETIME(COALESCE(disconnected_at, CURRENT_TIMESTAMP), 'localtime')
ELSE DATETIME('$to_datestring','localtime', 'start of day', '+86399 seconds')
ELSE DATETIME('$to_datestring','start of day', '+86399 seconds') END ), 'utc') - STRFTIME('%s', ( CASE
WHEN DATETIME(connected_at,'localtime')
DATETIME('$from_datestring', 'localtime', 'start of day')
WHEN DATETIME(connected_at,'localtime')
DATETIME('$from_datestring', 'start of day')
THEN DATETIME(connected_at,'localtime')
ELSEDATETIME('$from_datestring',
'localtime', 'start of day')
ELSEDATETIME('$from_datestring',
'start of day') END ), 'utc') ) AS duration @@ -133,10 +133,10 @@ my $database_query = qq( ( disconnected_at IS NULL OR
DATETIME(disconnected_at, 'localtime') >DATETIME('$from_datestring', 'localtime', 'start of day')
DATETIME(disconnected_at, 'localtime') >DATETIME('$from_datestring', 'start of day') ) AND
DATETIME(connected_at, 'localtime') <DATETIME('$to_datestring', 'localtime', 'start of day', '+86399
seconds')
DATETIME(connected_at, 'localtime') <DATETIME('$to_datestring', 'start of day', '+86399 seconds') GROUP BY common_name ORDER BY common_name, duration DESC; ); @@ -148,9 +148,9 @@ if ($cgiparams{'CONNECTION_NAME'}) { WHERE common_name = '$cgiparams{"CONNECTION_NAME"}' AND (
DATETIME(disconnected_at, 'localtime') >DATETIME('$from_datestring', 'localtime', 'start of day')
DATETIME(disconnected_at, 'localtime') >DATETIME('$from_datestring', 'start of day') AND
DATETIME(connected_at, 'localtime') <DATETIME('$to_datestring', 'localtime', 'start of day', '+86399
seconds')
DATETIME(connected_at, 'localtime') <DATETIME('$to_datestring', 'start of day', '+86399 seconds') ) ORDER BY connected_at; ); -- 2.30.2