mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 19:23:24 +02:00
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
Conflicts: config/rootfiles/core/47/filelists/files
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
/var/ipfire/auth/users
|
||||
/var/ipfire/dhcp/*
|
||||
/var/ipfire/main/*
|
||||
/var/ipfire/outgoing/groups
|
||||
/var/ipfire/outgoing/rules
|
||||
/var/ipfire/outgoing/p2protocols
|
||||
/var/ipfire/ovpn
|
||||
|
||||
@@ -2,3 +2,5 @@ etc/system-release
|
||||
etc/rc.d/init.d/sshd
|
||||
srv/web/ipfire/cgi-bin/services.cgi
|
||||
srv/web/ipfire/cgi-bin/remote.cgi
|
||||
srv/web/ipfire/cgi-bin/ids.cgi
|
||||
var/ipfire/backup/include
|
||||
|
||||
Reference in New Issue
Block a user