aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-18 13:55:02 -0800
committerMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-18 13:55:02 -0800
commitf53cafa945f30819e06306bbfa27d9c940bb7be1 (patch)
tree93cb91b4015013f1f213dbb05b553a304589a525 /config
parent78ba67d63e6808adace9b8cf55253790042ad76a (diff)
parent175f18fd8f44c7d98ca1ad924393ee991ec13e42 (diff)
downloadpfsense-packages-f53cafa945f30819e06306bbfa27d9c940bb7be1.tar.gz
pfsense-packages-f53cafa945f30819e06306bbfa27d9c940bb7be1.tar.bz2
pfsense-packages-f53cafa945f30819e06306bbfa27d9c940bb7be1.zip
Merge pull request #551 from timdufrane/master
Add syslog capability
Diffstat (limited to 'config')
-rwxr-xr-xconfig/dansguardian/dansguardian.conf.template2
-rwxr-xr-xconfig/dansguardian/dansguardian.inc1
-rw-r--r--config/dansguardian/dansguardian_log.xml1
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>