diff options
author | jim-p <jimp@pfsense.org> | 2010-11-02 15:14:11 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2010-11-02 15:14:11 -0400 |
commit | a6607b5fe0b480074b458480722326368f51c125 (patch) | |
tree | cbd4b24c8252c6edc2cd7c6cfc925f65e7387a13 /etc | |
parent | f856e762704c09e8508ec237ad12b7ba3825aa0c (diff) | |
download | pfsense-a6607b5fe0b480074b458480722326368f51c125.zip pfsense-a6607b5fe0b480074b458480722326368f51c125.tar.gz |
More VPN log fixes, for consistency. Ticket #912
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/system.inc | 14 | ||||
-rw-r--r-- | etc/inc/vpn.inc | 12 | ||||
-rwxr-xr-x | etc/rc | 18 |
3 files changed, 22 insertions, 22 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index ba9ad05..23e9b64 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -443,7 +443,7 @@ function system_syslogd_start() { } if (isset($syslogcfg)) { - $separatelogfacilities = array('ntpd','racoon','openvpn'); + $separatelogfacilities = array('ntpd','racoon','openvpn','pptps','poes','l2tps'); if($config['installedpackages']['package']) { foreach($config['installedpackages']['package'] as $package) { if($package['logging']) { @@ -468,15 +468,15 @@ function system_syslogd_start() { $syslogconf .= "!ppp\n"; if (!isset($syslogcfg['disablelocallogging'])) $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/ppp.log\n"; - $syslogconf .= "!pptp\n"; + $syslogconf .= "!pptps\n"; if (!isset($syslogcfg['disablelocallogging'])) - $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/pptp.log\n"; - $syslogconf .= "!pppoe\n"; + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/pptps.log\n"; + $syslogconf .= "!poes\n"; if (!isset($syslogcfg['disablelocallogging'])) - $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/pppoe.log\n"; - $syslogconf .= "!l2tp\n"; + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/poes.log\n"; + $syslogconf .= "!l2tps\n"; if (!isset($syslogcfg['disablelocallogging'])) - $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/l2tp.log\n"; + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/l2tps.log\n"; $syslogconf .= "!racoon\n"; if (!isset($syslogcfg['disablelocallogging'])) $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/ipsec.log\n"; diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 642476b..4e8f4ca 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -996,7 +996,7 @@ function vpn_pptpd_configure() { } $mpdconf = <<<EOD -pptpd: +pptps: EOD; @@ -1144,7 +1144,7 @@ EOD; chmod("{$g['varetc_path']}/pptp-vpn/mpd.secret", 0600); /* fire up mpd */ - mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pptp-vpn -p {$g['varrun_path']}/pptp-vpn.pid -s pptp -f mpd.conf pptpd"); + mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pptp-vpn -p {$g['varrun_path']}/pptp-vpn.pid -s pptps pptps"); break; @@ -1208,7 +1208,7 @@ function vpn_pppoe_configure(&$pppoecfg) { return 1; } $mpdconf = "\n\n"; - $mpdconf .= "pppoe:\n"; + $mpdconf .= "poes:\n"; for ($i = 0; $i < $pppoecfg['n_pppoe_units']; $i++) { $mpdconf .= " load poes{$pppoecfg['pppoeid']}{$i}\n"; @@ -1347,7 +1347,7 @@ EOD; } /* fire up mpd */ - mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pppoe{$pppoecfg['pppoeid']}-vpn -p {$g['varrun_path']}/pppoe{$pppoecfg['pppoeid']}-vpn.pid -s pppoe pppoe"); + mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pppoe{$pppoecfg['pppoeid']}-vpn -p {$g['varrun_path']}/pppoe{$pppoecfg['pppoeid']}-vpn.pid -s poes poes"); break; } @@ -1402,7 +1402,7 @@ function vpn_l2tp_configure() { } $mpdconf = "\n\n"; $mpdconf .=<<<EOD -l2tp: +l2tps: EOD; @@ -1528,7 +1528,7 @@ EOD; chmod("{$g['varetc_path']}/l2tp-vpn/mpd.secret", 0600); /* fire up mpd */ - mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/l2tp-vpn -p {$g['varrun_path']}/l2tp-vpn.pid -s l2tp l2tp"); + mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/l2tp-vpn -p {$g['varrun_path']}/l2tp-vpn.pid -s l2tps l2tps"); break; @@ -243,9 +243,9 @@ if [ "$DISABLESYSLOGCLOG" -gt "0" ]; then /usr/bin/touch /var/log/filter.log /usr/bin/touch /var/log/dhcpd.log /usr/bin/touch /var/log/vpn.log - /usr/bin/touch /var/log/pptp.log - /usr/bin/touch /var/log/pppoe.log - /usr/bin/touch /var/log/l2tp.log + /usr/bin/touch /var/log/pptps.log + /usr/bin/touch /var/log/poes.log + /usr/bin/touch /var/log/l2tps.log /usr/bin/touch /var/log/openvpn.log /usr/bin/touch /var/log/portalauth.log /usr/bin/touch /var/log/ipsec.log @@ -262,9 +262,9 @@ else /usr/sbin/fifolog_create -s 511488 /var/log/filter.log /usr/sbin/fifolog_create -s 50688 /var/log/dhcpd.log /usr/sbin/fifolog_create -s 50688 /var/log/vpn.log - /usr/sbin/fifolog_create -s 50688 /var/log/pptp.log - /usr/sbin/fifolog_create -s 50688 /var/log/pppoe.log - /usr/sbin/fifolog_create -s 50688 /var/log/l2tp.log + /usr/sbin/fifolog_create -s 50688 /var/log/pptps.log + /usr/sbin/fifolog_create -s 50688 /var/log/poes.log + /usr/sbin/fifolog_create -s 50688 /var/log/l2tps.log /usr/sbin/fifolog_create -s 50688 /var/log/openvpn.log /usr/sbin/fifolog_create -s 50688 /var/log/portalauth.log /usr/sbin/fifolog_create -s 50688 /var/log/ipsec.log @@ -278,9 +278,9 @@ else /usr/sbin/clog -i -s 512144 /var/log/filter.log /usr/sbin/clog -i -s 65535 /var/log/dhcpd.log /usr/sbin/clog -i -s 65535 /var/log/vpn.log - /usr/sbin/clog -i -s 50688 /var/log/pptp.log - /usr/sbin/clog -i -s 50688 /var/log/pppoe.log - /usr/sbin/clog -i -s 50688 /var/log/l2tp.log + /usr/sbin/clog -i -s 50688 /var/log/pptps.log + /usr/sbin/clog -i -s 50688 /var/log/poes.log + /usr/sbin/clog -i -s 50688 /var/log/l2tps.log /usr/sbin/clog -i -s 65535 /var/log/openvpn.log /usr/sbin/clog -i -s 65535 /var/log/portalauth.log /usr/sbin/clog -i -s 65535 /var/log/ipsec.log |