diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2012-05-07 15:25:22 -0300 |
|---|---|---|
| committer | marcelloc <marcellocoutinho@gmail.com> | 2012-05-07 15:25:22 -0300 |
| commit | d9bb4967f4234993efab65bf22bcb60e3e621cc4 (patch) | |
| tree | 3647a276001ad63d8966a80cbaadfd492ad9a452 | |
| parent | af9133e026a27b5007c268c4b6598a9b4d89ee31 (diff) | |
| download | pfsense-packages-d9bb4967f4234993efab65bf22bcb60e3e621cc4.tar.gz pfsense-packages-d9bb4967f4234993efab65bf22bcb60e3e621cc4.tar.bz2 pfsense-packages-d9bb4967f4234993efab65bf22bcb60e3e621cc4.zip | |
sarg -fix exclude_string and exclude_codes declaration on sarg.conf
| -rw-r--r-- | config/sarg/sarg.inc | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc index e650efd6..2bcd4115 100644 --- a/config/sarg/sarg.inc +++ b/config/sarg/sarg.inc @@ -209,7 +209,7 @@ function sync_package_sarg() { $date_format=(empty($sarg['report_date_format'])?"u":$sarg['report_date_format']); $report_type=preg_replace('/,/',' ',$sarg['report_type']); $report_charset=(empty($sarg['report_charset'])?"UTF-8":$sarg['report_charset']); - $exclude_string=(empty($sarg['exclude_string'])?"":'exclude_string"'.$sarg['exclude_string']."'"); + $exclude_string=(empty($sarg['exclude_string'])?"":'exclude_string "'.$sarg['exclude_string'].'"'); #limits $max_elapsed=(empty($sarg['max_elapsed'])?"0":$sarg['max_elapsed']); @@ -257,7 +257,7 @@ function sync_package_sarg() { include("/usr/local/pkg/sarg.template"); file_put_contents("/usr/local/etc/sarg/sarg.conf", $sg, LOCK_EX); file_put_contents('/usr/local/etc/sarg/exclude_hosts.conf', sarg_text_area_decode($sarg['exclude_hostlist']),LOCK_EX); - file_put_contents('/usr/local/etc/sarg/exclude_codes.conf', sarg_text_area_decode($sarg['exclude_codelist']),LOCK_EX); + file_put_contents('/usr/local/etc/sarg/exclude_codes', sarg_text_area_decode($sarg['exclude_codelist']),LOCK_EX); file_put_contents('/usr/local/etc/sarg/hostalias',sarg_text_area_decode($sarg['hostalias']),LOCK_EX); file_put_contents('/usr/local/etc/sarg/exclude_users.conf', sarg_text_area_decode($sarguser['exclude_userlist']),LOCK_EX); diff --git a/pkg_config.8.xml b/pkg_config.8.xml index c58d8b0c..83b88a99 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -552,7 +552,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink> <depends_on_package_base_url>http://e-sac.siteseguro.ws/packages/8/All/</depends_on_package_base_url> <depends_on_package>sarg-2.3.2.tbz</depends_on_package> - <version>2.3.2 pkg v.0.4.2</version> + <version>2.3.2 pkg v.0.4.2_1</version> <status>beta</status> <required_version>2.0</required_version> <configurationfile>sarg.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index ef686936..6cc195b5 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -638,7 +638,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink> <depends_on_package_base_url>http://e-sac.siteseguro.ws/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package>sarg-2.3.2.tbz</depends_on_package> - <version>2.3.2 pkg v.0.4.2</version> + <version>2.3.2 pkg v.0.4.2_1</version> <status>beta</status> <required_version>2.0</required_version> <configurationfile>sarg.xml</configurationfile> |