diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-30 08:26:59 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-30 08:26:59 -0300 |
| commit | 487caee6a7cb2fa18367f513ca85c990be036a19 (patch) | |
| tree | 4766e6c42f5108cf0ef91161890e8228723b9a5a /etc/inc/rrd.inc | |
| parent | 02226b924f58b216b8771d65717d8d3d6b457d76 (diff) | |
| parent | dff71b6bbec5575cde975e47c6405b1fcad9c65b (diff) | |
| download | pfsense-487caee6a7cb2fa18367f513ca85c990be036a19.zip pfsense-487caee6a7cb2fa18367f513ca85c990be036a19.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/interfaces.inc
Diffstat (limited to 'etc/inc/rrd.inc')
| -rw-r--r-- | etc/inc/rrd.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc index da7f7e4..574c6a6 100644 --- a/etc/inc/rrd.inc +++ b/etc/inc/rrd.inc @@ -371,6 +371,7 @@ function enable_rrd_graphing() { foreach($config['openvpn']['openvpn-server'] as $server) { if("ovpns{$server['vpnid']}" == $ifname) { $port = $server['local_port']; + $vpnid = $server['vpnid']; } } } @@ -383,7 +384,7 @@ function enable_rrd_graphing() { $rrdupdatesh .= " echo \"quit\"\n"; $rrdupdatesh .= "}\n"; $rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$vpnusers N:\\\n"; - $rrdupdatesh .= "`list_current_users | nc localhost {$port} | awk -F\",\" '/^CLIENT_LIST/ {print \$2}' | wc -l | awk '{print $1}'`\n"; + $rrdupdatesh .= "`list_current_users | nc -U {$g['varetc_path']}/openvpn/server{$vpnid}.sock | awk -F\",\" '/^CLIENT_LIST/ {print \$2}' | wc -l | awk '{print $1}'` &\n"; } /* QUEUES, set up the queues databases */ |
