mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Correct logging to syslog and proper file for ipsec from strongswan

Browse Source 
* Use proper commands to reload strongswan rather than just the daemon
This commit is contained in:
Ermal 2014-02-12 15:48:40 +01:00
parent 042436e8f2
commit 7335fa5380
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/inc/system.inc
View File

@ -640,7 +640,7 @@ function system_syslogd_start() {
}
if (isset($syslogcfg)) {
$separatelogfacilities = array('ntp','ntpd','ntpdate','racoon','openvpn','pptps','poes','l2tps','relayd','hostapd','dnsmasq','filterdns','unbound','dhcpd','dhcrelay','dhclient','apinger','radvd','routed','olsrd','zebra','ospfd','bgpd','miniupnpd');
$separatelogfacilities = array('ntp','ntpd','ntpdate','charon','openvpn','pptps','poes','l2tps','relayd','hostapd','dnsmasq','filterdns','unbound','dhcpd','dhcrelay','dhclient','apinger','radvd','routed','olsrd','zebra','ospfd','bgpd','miniupnpd');
$syslogconf = "";
if($config['installedpackages']['package']) {
foreach($config['installedpackages']['package'] as $package) {
@ -676,7 +676,7 @@ function system_syslogd_start() {
if (!isset($syslogcfg['disablelocallogging']))
$syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/l2tps.log\n";
$syslogconf .= "!racoon\n";
$syslogconf .= "!charon\n";
if (!isset($syslogcfg['disablelocallogging']))
$syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/ipsec.log\n";
if (isset($syslogcfg['vpn']))

22
etc/inc/vpn.inc
View File

@ -255,6 +255,20 @@ charon {
# number of worker threads in charon
threads = 16
# And two loggers using syslog. The subsections define the facility to log
# to, currently one of: daemon, auth.
syslog {
identifier = charon
# default level to the LOG_DAEMON facility
daemon {
}
# very minimalistic IKE auditing logs to LOG_AUTHPRIV
auth {
default = -1
ike = 1
}
}
EOD;
if (is_array($a_client) && isset($a_client['enable']) && !empty($a_client['net_list']))
@ -811,9 +825,11 @@ EOD;
/* generate IPsec policies */
$natfilterrules = false;
/* mange process */
if (is_process_running("charon")) {
sleep("0.1");
mwexec("/usr/local/sbin/ipsec reloadall", false);
if (isvalidpid("{$g['varrun_path']/charon.pid")) {
/* Read secrets */
mwexec("/usr/local/sbin/ipsec rereadall", false);
/* Update configuration changes */
mwexec("/usr/local/sbin/ipsec update", false);
} else {
/* start racoon */
$ipsecdebug = isset($config['ipsec']['racoondebug']) ? "-d -v" : "";