webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-04 19:11:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	lfs/monit
This commit is contained in:
Arne Fitzenreiter
2015-04-11 21:58:09 +02:00
parent 1164cb0d0b c63e97bbaf
commit 0fbba54e82
20 changed files with 240 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/collectd
View File

@@ -243,3 +243,4 @@ usr/share/collectd/types.db
#usr/share/man/man5/collectd.conf.5
#usr/share/man/man5/types.db.5
#var/lib/collectd
var/ipfire/ovpn/collectd.vpn

1
config/rootfiles/common/misc-progs
View File

@@ -2,6 +2,7 @@ usr/local/bin/addonctrl
#usr/local/bin/applejuicectrl
usr/local/bin/backupctrl
#usr/local/bin/clamavctrl
usr/local/bin/collectdctrl
usr/local/bin/dhcpctrl
usr/local/bin/dnsmasqctrl
usr/local/bin/extrahdctrl

1
config/rootfiles/common/stage2
View File

@@ -124,6 +124,7 @@ usr/local/bin/update-lang-cache
#usr/local/src
#usr/sbin
usr/sbin/ovpn-ccd-convert
usr/sbin/ovpn-collectd-convert
#usr/share
#usr/share/doc
#usr/share/doc/licenses