webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,589 Commits 2 Branches 1 Tag
69c484e56ea35f951d8008f407f130433edcbe00
Commit Graph

14589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Fitzenreiter
69c484e56e borgbackup: fix 32bit rootfiles 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-03 09:47:44 +02:00
Stefan Schantl
430c7972cc Langs/de.pl: Add translations for OpenVPN roadwarrior connection log. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-02 18:14:35 +00:00
Arne Fitzenreiter
dbdfd030b4 vnstat: remove unmount ramdisk message 
this message will also print if no ramdisk is used at all.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-02 18:01:35 +00:00
Matthias Fischer
24df42efac vnstat 2.6: Fix for initscript - removed 'evaluate_retval' 
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-02 17:36:22 +00:00
Arne Fitzenreiter
7b57e34210 webui: update rootfile 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-02 10:43:20 +00:00
Arne Fitzenreiter
88e8bf31ce coreutils: add uptream patch to fix build on aarch64 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-02 10:39:19 +00:00
Arne Fitzenreiter
0f253a2e96 core145: add vnstat 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-02 10:38:51 +00:00
Arne Fitzenreiter
c242db4e55 core145: add open vpn changes 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:28:08 +00:00
Michael Tremer
616de0b48c openvpn: Store connection times in ASCII timestamps 
This format seems to be a lot easier to handle in SQLite queries.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:18:17 +00:00
Michael Tremer
708f2b7368 openvpn: Add metrics script 
This script is called when an OpenVPN Roadwarrior client
connects or disconnect and logs the start and duration
of the session.

This can be used to monitor session duration and data transfer.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:18:00 +00:00
Stefan Schantl
f81fe76354 Langs/en.pl: Add duration. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:15:48 +00:00
Stefan Schantl
c8055deb12 Add ovpnclients page to log menu. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:15:36 +00:00
Michael Tremer
186c0ddd91 OpenVPN Log: Add connection duration 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:15:25 +00:00
Michael Tremer
3a684078b5 OpenVPN: Capitalise some headings and labels 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:15:12 +00:00
Stefan Schantl
b10612e8ba ovpnclients.dat: Align traffic values to the right side. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:14:58 +00:00
Stefan Schantl
7b54c0fb7b ovpnclients.dat: Fix type in received. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:14:48 +00:00
Stefan Schantl
25932be3e3 general-functions.pl: formatBytes() Fix computing the correct unit. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:14:36 +00:00
Stefan Schantl
e1cc1e6cb9 ovpnclients.dat: Do not perform DB actions if there is an error message. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:14:21 +00:00
Stefan Schantl
0f195a5305 ovpnclients.dat: Display error when the to date is not later than the from date. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:14:11 +00:00
Stefan Schantl
c7d55d7fbd ovpnclients.dat: Display a notice if there are no entries. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:13:57 +00:00
Stefan Schantl
1242cb0134 ovpnclients.dat: Convert timestamps into localtime. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:13:46 +00:00
Stefan Schantl
d5b6023c32 ovpnclients.dat: Add table header. 
The header will be dynamically generated, according the items which will
be displayed.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:13:28 +00:00
Stefan Schantl
896e882cf3 Langs: Add strings for disconnect, sent and recieved. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:13:06 +00:00
Stefan Schantl
8615383823 ovpnclients.dat: Display traffic details in a human-readable format. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:12:51 +00:00
Stefan Schantl
c5f85b1152 general-functions.pl: Add formatBytes() function. 
This function can be used to convert an amount of bytes to a
humand-readable format.

For example "3221225472" will become "3MB".

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:12:40 +00:00
Stefan Schantl
6317d55c4a ovpnclients.dat: Fix hard coded language string 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:12:28 +00:00
Michael Tremer
70e1d58745 OpenVPN: Fix query when selecting sessions only 
Previously some sessions were selected which did not qualify
for the search.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:12:10 +00:00
Stefan Schantl
3e10b3de4a openvpn: Add WUI page for client usage statistics 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:11:50 +00:00
Arne Fitzenreiter
289d7c8374 core145: add coreutils 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:10:17 +00:00
Peter Müller
b347830644 coreutils: update to 8.32 
Cc: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:08:40 +00:00
Peter Müller
480afae717 automake: update to 1.16.2 
This is required in order to build coreutils 8.32.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 19:08:38 +00:00
Arne Fitzenreiter
2d85c1fe86 Revert "libwww-perl: update to 6.43" 
This reverts commit 3bcd393e18.
this has a corrupt rootfile:
Error! '/x86_64' in rootfiles files found!
./config/rootfiles/common/libwww-perl:#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/libwww
./config/rootfiles/common/libwww-perl:#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/libwww/perl
./config/rootfiles/common/libwww-perl:usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/libwww/perl/.packlist
Replace by MACHINE !

and if i fix this it break pakfire.
 2020-05-01 13:04:09 +00:00
Arne Fitzenreiter
5e32ee6a30 iproute2: fix rootfile 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-05-01 00:38:20 +02:00
Arne Fitzenreiter
7bdeaf3046 core145: add vnstat changes 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:26:59 +00:00
Arne Fitzenreiter
077e110eb6 core145: add libwww-perl 2020-04-30 15:15:24 +00:00
Peter Müller
3bcd393e18 libwww-perl: update to 6.43 
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:14:30 +00:00
Arne Fitzenreiter
8dd9b43662 core145: add pakfire functions.pl 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:13:37 +00:00
Peter Müller
cf33650eb3 Pakfire: do not leak upstream proxy password in log messages 
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:11:54 +00:00
Peter Müller
d96d5db6e5 Pakfire: fix upstream proxy usage 
This patch ensures Pakfire will download updates via the configured
upstream proxy (if any) for both HTTP and HTTPS.

Fixes: #12357

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:11:42 +00:00
Arne Fitzenreiter
1aa097a947 core145: add system.cgi 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:10:08 +00:00
Peter Müller
003fb6f608 system.cgi: correctly translate CPU frequency 
The CPU frequency diagram used the same "translation" as the CPU load,
which was confusing. This patch introduces a dedicated translation for
"CPU frequency", which makes things a little bit better but still does
not solve a Deppenleerzeichen ("CPU-Frequenz Diagramm") in the German
translation.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:07:06 +00:00
Peter Müller
2a554ea34f lang: fix typo (MacVTtap != MacVTap) 
Fixes: #12339

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:06:49 +00:00
Erik Kapfer
086c09eefb borgbackup: Fixes DEP error. Update to 1.1.11 
Fixes #12356

Several fixes but also new features has been added with this version.
Full changelog can be found in here --> https://github.com/borgbackup/borg/blob/1.1.11/docs/changes.rst#version-1111-2020-03-08 .

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:06:28 +00:00
Matthias Fischer
51044e048f vnstat 2.6: Added status section for initscript 
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:05:39 +00:00
Matthias Fischer
49d09728cc vnstat 2.6: Fix for initskript 
Removed 'sleep 2'

Added exit status in 'stop'-section

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 15:04:37 +00:00
Matthias Fischer
8c7446ab08 vnstat 2.6: Fix for rootfile 
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 14:56:49 +00:00
Matthias Fischer
68a6d1053f makegraphs: 'vnstat -u' is no longer supported/needed 
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 14:56:27 +00:00
Matthias Fischer
5a5de3f026 vnstat 2.6: New initscript 
Added the  new 'vnstatd' daemon to 'start' and 'stop' section.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 14:56:15 +00:00
Matthias Fischer
29f35b79c7 traffic.cgi: Changed time interval for vnstat graphs from 5 to 1 minute 
This keeps the graphs a bit more "updated".

From 'man vnstat':
'-c (--cache-time) => Update output file only if at least *time* minutes
have passed since the previous file update.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 14:55:51 +00:00
Matthias Fischer
7b1134ea60 vnstat: Update to 2.6 
For details see:
https://humdi[dot]net/vnstat/CHANGES

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-30 14:55:22 +00:00