diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2013-11-22 23:27:10 -0500 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2013-11-22 23:27:10 -0500 |
| commit | 3fd53f7221352702ffe64f9de9ef7820b75e51b8 (patch) | |
| tree | 196c73ff9ba9278f25fc9db063cbf182c75772f6 /config/dansguardian | |
| parent | 595c831d2768547d49e6daf147889c6aee15f9a4 (diff) | |
| parent | 3a5b698d014f470e7b475261d5e7d2926d4fc220 (diff) | |
| download | pfsense-packages-3fd53f7221352702ffe64f9de9ef7820b75e51b8.tar.gz pfsense-packages-3fd53f7221352702ffe64f9de9ef7820b75e51b8.tar.bz2 pfsense-packages-3fd53f7221352702ffe64f9de9ef7820b75e51b8.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/dansguardian')
| -rwxr-xr-x | config/dansguardian/dansguardian.conf.template | 2 | ||||
| -rwxr-xr-x | config/dansguardian/dansguardian.inc | 1 | ||||
| -rw-r--r-- | config/dansguardian/dansguardian_log.xml | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/config/dansguardian/dansguardian.conf.template b/config/dansguardian/dansguardian.conf.template index ed514eca..a6bcee1c 100755 --- a/config/dansguardian/dansguardian.conf.template +++ b/config/dansguardian/dansguardian.conf.template @@ -90,7 +90,7 @@ anonymizelogs = {$anonymizelogs} # # Use syslog for access logging instead of logging to the file # at the defined or built-in "loglocation" -#logsyslog = off +logsyslog = {$logsyslog} # Log file location # diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc index b31df8ab..ad6e6482 100755 --- a/config/dansguardian/dansguardian.inc +++ b/config/dansguardian/dansguardian.inc @@ -232,6 +232,7 @@ function sync_package_dansguardian($via_rpc="no",$install_process=false) { $nologger=(preg_match('/nologger/',$dansguardian_log['logging_options'])?"on":"off"); $logadblocks=(preg_match('/logadblocks/',$dansguardian_log['logging_options'])?"on":"off"); $anonymizelogs=(preg_match('/anonymizelogs/',$dansguardian_log['logging_options'])?"on":"off"); + $logsyslog=(preg_match('/logsyslog/',$dansguardian_log['logging_options'])?"on":"off"); $loglevel=($dansguardian_log['loglevel']?$dansguardian_log['loglevel']:"2"); $logexceptionhits=($dansguardian_log['logexceptionhits']?$dansguardian_log['logexceptionhits']:"2"); diff --git a/config/dansguardian/dansguardian_log.xml b/config/dansguardian/dansguardian_log.xml index 88281dff..97cd5b0b 100644 --- a/config/dansguardian/dansguardian_log.xml +++ b/config/dansguardian/dansguardian_log.xml @@ -197,6 +197,7 @@ <option><name>nologger (off)</name><value>nologger</value></option> <option><name>logadblocks (off)</name><value>logadblocks</value></option> <option><name>Anonymize logs (off)</name><value>anonymizelogs</value></option> + <option><name>Log to syslog (off)</name><value>logsyslog</value></option> </options> <multiple/> <size>6</size> |