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

Merge remote-tracking branch 'origin/next' into kernel-4.14

Browse Source
This commit is contained in:
Arne Fitzenreiter
2017-12-18 18:22:06 +01:00
parent 547a03301d cbcc135126
commit d952f7557e
83 changed files with 242 additions and 14440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/apache2
View File

@@ -46,8 +46,6 @@ etc/httpd/conf/uid.conf
etc/httpd/conf/vhosts.d/captive.conf
etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
etc/httpd/conf/vhosts.d/ipfire-interface.conf
#etc/httpd/conf/vhosts.d/nagios.conf
#etc/httpd/conf/vhosts.d/openmailadmin.conf
#srv/web
#srv/web/ipfire
#srv/web/ipfire/manual/howto/access.html.es

1
config/rootfiles/common/tunctl
View File

@@ -1 +0,0 @@
usr/bin/tunctl