diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2013-09-19 10:46:26 -0300 |
|---|---|---|
| committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2013-09-19 10:46:26 -0300 |
| commit | 1c5d678bfde140dd8e5e3611dc5e75ef055129b7 (patch) | |
| tree | a4dd7707169ffd28f818a0763da6c583d002f3a6 | |
| parent | 145c6665c5d1864ac4f4f2c3f3171d47c8bdd982 (diff) | |
| download | pfsense-packages-1c5d678bfde140dd8e5e3611dc5e75ef055129b7.tar.gz pfsense-packages-1c5d678bfde140dd8e5e3611dc5e75ef055129b7.tar.bz2 pfsense-packages-1c5d678bfde140dd8e5e3611dc5e75ef055129b7.zip | |
sarg - fix squidguard conf dir
| -rw-r--r-- | config/sarg/sarg.inc | 8 | ||||
| -rw-r--r-- | config/sarg/sarg.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc index 32cca7ed..e4740b42 100644 --- a/config/sarg/sarg.inc +++ b/config/sarg/sarg.inc @@ -4,7 +4,7 @@ sarg.inc part of pfSense (http://www.pfSense.com) Copyright (C) 2007 Joao Henrique F. Freitas - Copyright (C) 2012 Marcello Coutinho + Copyright (C) 2012-2013 Marcello Coutinho All rights reserved. */ /* ========================================================================== */ @@ -34,11 +34,13 @@ $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version > 2.0){ define('SARG_DIR', '/usr/pbi/sarg-' . php_uname("m")); + define('SQGARD_DIR','/usr/pbi/squidguard-' . php_uname("m")); define('SQUID_DIR', '/usr/pbi/squid-' . php_uname("m")); define('DANSG_DIR', '/usr/pbi/dansguardian-' . php_uname("m")); } else{ define('SARG_DIR', '/usr/local'); + define('SQGARD_DIR', '/usr/local'); define('SQUID_DIR', '/usr/local'); define('DANSG_DIR', '/usr/local'); } @@ -50,7 +52,7 @@ if ($uname['machine']=='amd64') // STATIC VARS $sarg_proxy=array( 'squid_rc'=> SQUID_DIR . '/etc/rc.d/squid.sh', 'squid_config'=> '/var/squid/logs/access.log', - 'squidguard_config'=> SARG_DIR . '/etc/squidGuard/squidGuard.conf', + 'squidguard_config'=> SQGARD_DIR . '/etc/squidGuard/squidGuard.conf', 'squidguard_block_log'=>'/var/squidGuard/log/block.log', 'dansguardian_config'=> DANSG_DIR . '/etc/dansguardian/dansguardian.conf', 'dansguardian_log'=>'/var/log/dansguardian/access.log'); @@ -258,7 +260,7 @@ function sync_package_sarg() { $bytes_in_sites_users_report=(preg_match('/bytes_in_sites_users_report/',$sarg['report_options'])?"yes":"no"); $date_time_by=(preg_match('/date_time_by_bytes/',$sarg['report_options'])?"bytes":""); $date_time_by.=(preg_match('/date_time_by_elap/',$sarg['report_options'])?" elap":""); - $date_format=(empty($sarg['report_date_format'])?"u":$sarg['report_date_format']); + $date_format=(preg_match("/\w/",$sarg['report_date_format'])?$sarg['report_date_format']:"u"); $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'].'"'); diff --git a/config/sarg/sarg.xml b/config/sarg/sarg.xml index bb345379..cc11cad4 100644 --- a/config/sarg/sarg.xml +++ b/config/sarg/sarg.xml @@ -9,7 +9,7 @@ /* sarg.xml part of the sarg for pfSense - Copyright (C) 2012 Marcello Coutinho + Copyright (C) 2012-2013 Marcello Coutinho All rights reserved. */ diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 9a9a9fdf..2ac3b694 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -715,7 +715,7 @@ <depends_on_package>sarg-2.3.6.tbz</depends_on_package> <depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package> <depends_on_package_pbi>sarg-2.3.6-i386.pbi</depends_on_package_pbi> - <version>2.3.6 pkg v.0.6.1</version> + <version>2.3.6 pkg v.0.6.2</version> <status>Release</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 f93153cf..5e3e611e 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -702,7 +702,7 @@ <depends_on_package>sarg-2.3.6.tbz</depends_on_package> <depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package> <depends_on_package_pbi>sarg-2.3.6-amd64.pbi</depends_on_package_pbi> - <version>2.3.6 pkg v.0.6.1</version> + <version>2.3.6 pkg v.0.6.2</version> <status>Release</status> <required_version>2.0</required_version> <configurationfile>sarg.xml</configurationfile> |