diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2012-05-03 19:30:17 -0300 |
|---|---|---|
| committer | marcelloc <marcellocoutinho@gmail.com> | 2012-05-03 19:30:17 -0300 |
| commit | a06400b906893ccace83e11cf5bb76e431557b24 (patch) | |
| tree | 6b0aa7422cc637c1048b028557799e51d023417e /config/dansguardian | |
| parent | 08e2b2389dd192eaacc637fbbb97aa287de8ad0f (diff) | |
| download | pfsense-packages-a06400b906893ccace83e11cf5bb76e431557b24.tar.gz pfsense-packages-a06400b906893ccace83e11cf5bb76e431557b24.tar.bz2 pfsense-packages-a06400b906893ccace83e11cf5bb76e431557b24.zip | |
postfix - reduce boot process and include startup check
Diffstat (limited to 'config/dansguardian')
| -rwxr-xr-x | config/dansguardian/dansguardian.inc | 8 | ||||
| -rwxr-xr-x | config/dansguardian/dansguardian_groups.xml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc index 26e213a2..0712324e 100755 --- a/config/dansguardian/dansguardian.inc +++ b/config/dansguardian/dansguardian.inc @@ -32,6 +32,9 @@ require_once("util.inc"); require("globals.inc"); #require("guiconfig.inc"); +$uname=posix_uname(); +if ($uname['machine']=='amd64') + ini_set('memory_limit', '250M'); function dg_text_area_decode($text){ return preg_replace('/\r\n/', "\n",base64_decode($text)); @@ -92,6 +95,9 @@ function sync_package_dansguardian() { $boot_process="on"; } + if (is_process_running('dansguardian') && isset($boot_process)) + return; + #assign xml arrays if (!is_array($config['installedpackages']['dansguardian'])) $config['installedpackages']['dansguardian']['config'][0]=array('interface'=>'lo0', @@ -687,7 +693,7 @@ function sync_package_dansguardian() { 'group_options' => "scancleancache,infectionbypasserrorsonly", 'reportinglevel'=>'3', 'mode'=> "1", - 'report_level'=>"general"); + 'report_level'=>"global"); $groups=array("scancleancache","hexdecodecontent","blockdownloads","enablepics","deepurlanalysis","infectionbypasserrorsonly","disablecontentscan","sslcertcheck","sslmitm"); #loop on array diff --git a/config/dansguardian/dansguardian_groups.xml b/config/dansguardian/dansguardian_groups.xml index 063d55fa..96429567 100755 --- a/config/dansguardian/dansguardian_groups.xml +++ b/config/dansguardian/dansguardian_groups.xml @@ -250,7 +250,7 @@ If defined, this overrides the global setting in dansguardian.conf for members of this filter group.]]></description> <type>select</type> <options> - <option><name>Use General log option selected on Report and log - recommended</name><value>Global</value></option> + <option><name>Use General log option selected on Report and log - recommended</name><value>global</value></option> <option><name>Use HTML template file (accessdeniedaddress ignored)</name><value>3</value></option> <option><name>Report fully</name><value>2</value></option> <option><name>Report why but not what denied phrase</name><value>1</value></option> |