From d4d21883ec492185c4aad430059c54f3893cb079 Mon Sep 17 00:00:00 2001 From: Nacho Date: Thu, 30 Apr 2015 09:36:23 +0100 Subject: Update havp.inc This changes fix HAVP on pfsense 2.2.2 as related on https://forum.pfsense.org/index.php?topic=90706.0 --- config/havp/havp.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/havp/havp.inc b/config/havp/havp.inc index 1648bcb0..3e77903c 100644 --- a/config/havp/havp.inc +++ b/config/havp/havp.inc @@ -76,7 +76,7 @@ define('HVDEF_PROXYPORT', '8080'); define('HVDEF_MAXSCANSIZE', '5000000'); # [bytes] ! do not enter 0 or big size ! define('HVDEF_MAXARCSCANSIZE', '5000000'); # [bytes] ! do not enter 0 or big size ! define('HVDEF_PID_FILE', '/var/run/havp.pid'); -define('HVDEF_WORK_DIR', '/usr/local/etc/havp'); +define('HVDEF_WORK_DIR', '/usr/pbi/havp-amd64/local/etc'); $pfSversion = str_replace("\s", "", file_get_contents("/etc/version")); if(preg_match("/^2./",$pfSversion)) @@ -101,8 +101,8 @@ define('HVDEF_HAVP_MINSRV', '3'); define('HVDEF_HAVP_MAXSRV', '100'); # Clam -#define('HVDEF_CLAM_RUNDIR', '/var/run/clamav'); -define('HVDEF_CLAM_RUNDIR', '/var/run'); +define('HVDEF_CLAM_RUNDIR', '/var/run/clamav'); +#define('HVDEF_CLAM_RUNDIR', '/var/run'); define('HVDEF_CLAM_DBDIR', '/var/db/clamav'); if(preg_match("/^2./",$pfSversion)) define('HVDEF_AVLOG_DIR', '/var/log/clamav'); @@ -446,9 +446,9 @@ function havp_check_system() # =-= ClamAV =-= # catalog for Pid and Socket files -# if (!file_exists(HVDEF_CLAM_RUNDIR)) -# mwexec("mkdir -p " . HVDEF_CLAM_RUNDIR); -# havp_set_file_access(HVDEF_CLAM_RUNDIR, HVDEF_USER, '0774'); + if (!file_exists(HVDEF_CLAM_RUNDIR)) + mwexec("mkdir -p " . HVDEF_CLAM_RUNDIR); + havp_set_file_access(HVDEF_CLAM_RUNDIR, HVDEF_USER, '0774'); # AV update script file_put_contents(HVDEF_AVUPD_SCRIPT, havp_AVupdate_script()); -- cgit v1.2.3 From 9405ea5e0f51096ebe0ba1e7d8efee9e74346e06 Mon Sep 17 00:00:00 2001 From: Nacho Date: Mon, 6 Jul 2015 13:20:41 +0100 Subject: Update havp.inc --- config/havp/havp.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/havp/havp.inc b/config/havp/havp.inc index 3e77903c..036f576e 100644 --- a/config/havp/havp.inc +++ b/config/havp/havp.inc @@ -76,7 +76,12 @@ define('HVDEF_PROXYPORT', '8080'); define('HVDEF_MAXSCANSIZE', '5000000'); # [bytes] ! do not enter 0 or big size ! define('HVDEF_MAXARCSCANSIZE', '5000000'); # [bytes] ! do not enter 0 or big size ! define('HVDEF_PID_FILE', '/var/run/havp.pid'); -define('HVDEF_WORK_DIR', '/usr/pbi/havp-amd64/local/etc'); + +if ($pf_version == "2.1" || $pf_version == "2.2") + define("HVDEF_WORK_DIR", "/usr/pbi/havp-" . php_uname("m") . "/local/etc"); + else + define("HVDEF_WORK_DIR", "/usr/local/etc/havp/"); + $pfSversion = str_replace("\s", "", file_get_contents("/etc/version")); if(preg_match("/^2./",$pfSversion)) -- cgit v1.2.3 From a5762a3a64237233908d3741bc6fb1a888bac307 Mon Sep 17 00:00:00 2001 From: Nacho Date: Mon, 6 Jul 2015 13:28:07 +0100 Subject: Update havp.inc --- config/havp/havp.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/havp/havp.inc b/config/havp/havp.inc index 036f576e..e7966a38 100644 --- a/config/havp/havp.inc +++ b/config/havp/havp.inc @@ -77,10 +77,11 @@ define('HVDEF_MAXSCANSIZE', '5000000'); # [bytes] ! do not enter 0 o define('HVDEF_MAXARCSCANSIZE', '5000000'); # [bytes] ! do not enter 0 or big size ! define('HVDEF_PID_FILE', '/var/run/havp.pid'); +$pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version == "2.1" || $pf_version == "2.2") define("HVDEF_WORK_DIR", "/usr/pbi/havp-" . php_uname("m") . "/local/etc"); else - define("HVDEF_WORK_DIR", "/usr/local/etc/havp/"); + define("HVDEF_WORK_DIR", "/usr/local/etc/havp"); $pfSversion = str_replace("\s", "", file_get_contents("/etc/version")); -- cgit v1.2.3