(proxy) add syslog target for access_log, closes https://github.com/opnsense/core/issues/1019

This commit is contained in:
Ad Schellevis 2016-07-20 18:56:21 +02:00
parent 07685b68aa
commit dd2f34ffd9
4 changed files with 61 additions and 2 deletions

View File

@ -0,0 +1,38 @@
<?php
/*
Copyright (C) 2016 Deciso B.V.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
function squid_syslog()
{
$logfacilities = array();
$logfacilities['squid.syslog'] = array(
'facility' => array('(squid-1)')
);
return $logfacilities;
}

View File

@ -21,6 +21,14 @@
<help>Enable access logging.</help>
<advanced>true</advanced>
</field>
<field>
<id>proxy.general.logging.target</id>
<label>Log target</label>
<type>dropdown</type>
<help>Send log data to.</help>
<advanced>true</advanced>
</field>
<field>
<id>proxy.general.logging.enable.storeLog</id>
<label>Enable store logging</label>

View File

@ -30,6 +30,13 @@
<Required>N</Required>
<mask>/^([\/0-9a-fA-F.:,])*/u</mask>
</ignoreLogACL>
<target type="OptionField">
<Required>N</Required>
<BlankDesc>File</BlankDesc>
<OptionValues>
<syslog>Syslog</syslog>
</OptionValues>
</target>
</logging>
<alternateDNSservers type="CSVListField">
<Required>N</Required>

View File

@ -305,10 +305,16 @@ dns_v4_first on
{% if OPNsense.proxy.general.logging.enable.accessLog == '0' %}
# Disable access logging
access_log none
{% elif OPNsense.proxy.general.logging.ignoreLogACL|default('') != '' %}
{% else %}
{% if OPNsense.proxy.general.logging.ignoreLogACL|default('') != '' %}
# ignore source hosts from access.log
acl accesslog_ignore src {{ OPNsense.proxy.general.logging.ignoreLogACL.replace(',', ' ') }}
access_log /var/log/squid/access.log squid !accesslog_ignore
{% endif %}
{% if OPNsense.proxy.general.logging.target|default('') == 'syslog' %}
access_log syslog:local4.info {% if OPNsense.proxy.general.logging.ignoreLogACL|default('') %}!accesslog_ignore {% endif %}
{% else %}
access_log /var/log/squid/access.log squid {% if OPNsense.proxy.general.logging.ignoreLogACL|default('') %}!accesslog_ignore {% endif %}
{% endif %}
{% endif %}
{% endif %}