Merge remote-tracking branch 'amarx/vpn-statistic1' into next

This commit is contained in:
Michael Tremer
2015-01-13 17:37:18 +01:00
14 changed files with 336 additions and 7 deletions

View File

@@ -1419,6 +1419,8 @@ srv/web/ipfire/cgi-bin/modem-status.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/netother.cgi
srv/web/ipfire/cgi-bin/netovpnrw.cgi
srv/web/ipfire/cgi-bin/netovpnsrv.cgi
srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/p2p-block.cgi

View File

@@ -2,6 +2,7 @@ etc/collectd.conf
etc/collectd.custom
etc/collectd.precache
etc/collectd.thermal
etc/collectd.vpn
etc/rc.d/init.d/collectd
etc/rc.d/rc0.d/K50collectd
etc/rc.d/rc3.d/S29collectd