From d5282decc68d3f6de6d0192e566e0797daf0a6b7 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 6 Sep 2015 20:48:05 +0200 Subject: sarg - code style cleanup and fixes sarg.xml - Fix copyright header - Nuke unused custom_php_(de)install_command - Fix file permissions - Code style and indentation fixes - Make descriptions readable and improve English. --- config/sarg/sarg.xml | 365 +++++++++++++++++++++++++++------------------------ 1 file changed, 197 insertions(+), 168 deletions(-) (limited to 'config/sarg') diff --git a/config/sarg/sarg.xml b/config/sarg/sarg.xml index 9266d211..00da6470 100644 --- a/config/sarg/sarg.xml +++ b/config/sarg/sarg.xml @@ -1,116 +1,103 @@ - - + + - - Describe your package here - Describe your package requirements here - Currently there are no FAQ items provided. sarg - 1.0 + 0.6.5 Status: Sarg Settings /usr/local/pkg/sarg.inc Sarg Reports - Configure sarg + Configure Sarg
Status
/pkg_edit.php?xml=sarg.xml
https://packages.pfsense.org/packages/config/sarg/sarg.inc /usr/local/pkg/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg_schedule.xml /usr/local/pkg/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg_sync.xml /usr/local/pkg/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg_users.xml /usr/local/pkg/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg_realtime.php /usr/local/www/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg_about.php /usr/local/www/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg.php /usr/local/www/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg_reports.php /usr/local/www/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg_frame.php /usr/local/www/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg_sorttable.js /usr/local/www/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg.template /usr/local/pkg/ - 0755 https://packages.pfsense.org/packages/config/sarg/sarg.priv.inc /etc/inc/priv/ - 0755 @@ -142,120 +129,133 @@ Help /sarg_about.php - + Report Settings listtopic - Proxy server + Proxy Server proxy_server - - select - + Select proxy server type to read logs from. + select + - + Report Options report_options - - If you select any option, it will be enabled on conf file.
- Use CTRL + click on this field]]>
- select - - + + + Use CTRL + click to (de)select multiple values. + ]]> + + select + + - - - - + + + + - - + + - - + + - - - - 17 + + + + 16
- Report to generate + Report To Generate report_type - - Use CTRL + click on this field]]> - select - - - - - - - - + + + Use CTRL + click to (de)select multiple values. + ]]> + + select + + + + + + + + - - - - 10 + + + + 9 Date Format report_date_format - + Date format to use in reports. select - - - + + + + u - Report charset + Report Charset report_charset - + Select character set for the reports. select - - - - - - - - - - - - - - + + + + + + + + + + + + + + + UTF-8 Host Aliases hostalias - - Host names may contain up to one wildcard denoted by a *. The wildcard must not end the host name.
- The host name may be followed by an optional alias but if no alias is provided, the host name, including the wildcard, replaces any matching host name found in the log.
- Host names replaced by identical aliases are grouped together in the reports.
- IP addresses are supported and accept the CIDR notation both for IPv4 and IPv6 addresses.
- Sample:
- *.gstatic.com
- mt*.google.com
- *.myphone.microsoft.com
- *.myphone.microsoft.com:443 *.myphone.microsoft.com:secure
- *.freeav.net antivirus:freeav
- *.mail.live.com
- 65.52.00.00/14 *.mail.live.com]]>
+ + + Host names may contain up to one wildcard denoted by a *. The wildcard must not be at the end of the host name.
+ The host name may be followed by an optional alias; if no alias is provided, the host name, including the wildcard, replaces any matching host name found in the log.
+ Host names replaced by identical aliases are grouped together in the reports.
+ IP addresses are supported and accept the CIDR notation both for IPv4 and IPv6 addresses.

+ Examples:
+ *.gstatic.com
+ mt*.google.com
+ *.myphone.microsoft.com
+ *.myphone.microsoft.com:443 *.myphone.microsoft.com:secure
+ *.freeav.net antivirus:freeav
+ *.mail.live.com
+ 65.52.00.00/14 *.mail.live.com + ]]> +
textarea 70 10 @@ -268,77 +268,107 @@ Max Elapsed max_elapsed - - Samples: 0 means no checking
- 28800000 means 08 hours ]]>
- input - 10 + + + Examples: 0 means no checking; 28800000 means 8 hours. + ]]> + + input + 10 + 0
- Reports list limits + Files Limits lastlog - - The oldest report file will be automatically removed.0 means no limit.]]> - input - 10 + + + Default: 0 - means no limit. + ]]> + + input + 10 + 0 - Reports days limits + Days Limits daylimit - - Older report file will be automatically removed.
- Leave empty to do not remove old reports.]]>
- input - 10 + + + Leave empty to not remove old reports. + ]]> + + input + 10
Top Users Limit topuser_num - - input - 10 + + + + input + 10 + 0 Denied Limit denied_report_limit - - input - 10 + + input + 10 + 0 AuthFail Limit authfail_report_limit - - input - 10 + + input + 10 + 0 - User_report_limit + User Report Limit user_report_limit - - input - 10 + + input + 10 + 0 Exclude Settings listtopic - + Exclude string exclude_string - - Format: string1:string2:...:stringn]]> + + + Format: string1:string2:...:stringn + ]]> + input 70 - Exclude hosts + Exclude Hosts exclude_hostlist - - Eg.: 192.168.10.10 - exclude ip address only
- 192.168.10.0/24 - exclude full C class
- s1.acme.foo - exclude hostname only
- *.acme.foo - exclude full domain name]]>
+ +
+ Examples:
+ 192.168.10.10 - exclude this IP address only.
+ 192.168.10.0/24 - exclude entire subnet.
+ host1.example.com - exclude this hostname only.
+ *.example.com - exclude entire domain. + ]]> +
textarea 70 10 @@ -347,24 +377,23 @@ Exclude codes exclude_codelist - - Write one code per line. Lines starting with a # are ignored.
- Only codes matching exactly one of the line is rejected. The comparison is not case sensitive.]]>
+ + Squid result codes.
+ Only codes matching exactly one of the line is rejected. The comparison is not case sensitive.
+ Write one code per line. Lines starting with a # are ignored.
+ Example: NONE/400 + ]]> +
textarea 70 10 base64
- - sarg_php_install_command(); - - - sarg_php_deinstall_command(); - sarg_validate_input($_POST, $input_errors); - + sync_package_sarg(); -- cgit v1.2.3