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

Merge branch 'captive-portal' into next

Browse Source
This commit is contained in:
Michael Tremer
2017-10-04 16:10:07 +01:00
parent e2d934cf2b 0a219160ac
commit 027614d2dc
48 changed files with 2658 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/rootfiles/common/apache2
View File

@@ -43,6 +43,7 @@ etc/httpd/conf/server-tuning.conf
etc/httpd/conf/ssl-global.conf
etc/httpd/conf/uid.conf
#etc/httpd/conf/vhosts.d
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
@@ -91,6 +92,8 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
#srv/web/ipfire/error/include/top.html
#srv/web/ipfire/htdocs
#srv/web/ipfire/htdocs/index.html
#srv/web/ipfire/html
srv/web/ipfire/html/captive
#srv/web/ipfire/icons
#srv/web/ipfire/icons/README
#srv/web/ipfire/icons/README.html
@@ -1662,3 +1665,4 @@ usr/sbin/httpd
#usr/share/man/man8/rotatelogs.8
#usr/share/man/man8/suexec.8
var/log/httpd
var/log/httpd/captive

17
config/rootfiles/common/bootstrap Normal file
View File

@@ -0,0 +1,17 @@
#usr/share/bootstrap
#usr/share/bootstrap/css
usr/share/bootstrap/css/bootstrap.css
usr/share/bootstrap/css/bootstrap.css.map
usr/share/bootstrap/css/bootstrap-grid.css
usr/share/bootstrap/css/bootstrap-grid.css.map
usr/share/bootstrap/css/bootstrap-grid.min.css
usr/share/bootstrap/css/bootstrap-grid.min.css.map
usr/share/bootstrap/css/bootstrap.min.css
usr/share/bootstrap/css/bootstrap.min.css.map
usr/share/bootstrap/css/bootstrap-reboot.css
usr/share/bootstrap/css/bootstrap-reboot.css.map
usr/share/bootstrap/css/bootstrap-reboot.min.css
usr/share/bootstrap/css/bootstrap-reboot.min.css.map
#usr/share/bootstrap/js
usr/share/bootstrap/js/bootstrap.js
usr/share/bootstrap/js/bootstrap.min.js

10
config/rootfiles/common/configroot
View File

@@ -11,6 +11,11 @@ var/ipfire/auth
var/ipfire/backup/exclude.user
var/ipfire/backup/include.user
var/ipfire/ca
var/ipfire/captive
var/ipfire/captive/agb.txt
var/ipfire/captive/clients
var/ipfire/captive/settings
var/ipfire/captive/voucher_out
var/ipfire/certs
#var/ipfire/certs/index.txt
#var/ipfire/certs/serial
@@ -51,16 +56,14 @@ var/ipfire/extrahd
#var/ipfire/extrahd/settings
var/ipfire/firewall
#var/ipfire/firewall/config
#var/ipfire/firewall/dmz
#var/ipfire/firewall/geoipblock
#var/ipfire/firewall/input
#var/ipfire/firewall/nat
#var/ipfire/firewall/outgoing
#var/ipfire/firewall/p2protocols
#var/ipfire/firewall/settings
var/ipfire/fwhosts
#var/ipfire/fwhosts/customgroups
#var/ipfire/fwhosts/customgeoipgrp
#var/ipfire/fwhosts/customgroups
#var/ipfire/fwhosts/customhosts
#var/ipfire/fwhosts/customnetworks
#var/ipfire/fwhosts/customservicegrp
@@ -116,6 +119,7 @@ var/ipfire/menu.d/70-log.menu
#var/ipfire/menu.d/EX-tor.menu
#var/ipfire/menu.d/EX-wlanap.menu
var/ipfire/modem
var/ipfire/modem-lib.pl
#var/ipfire/modem/defaults
#var/ipfire/modem/settings
var/ipfire/modem-lib.pl

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

@@ -1,6 +1,7 @@
usr/local/bin/addonctrl
#usr/local/bin/applejuicectrl
usr/local/bin/backupctrl
usr/local/bin/captivectrl
#usr/local/bin/clamavctrl
usr/local/bin/collectdctrl
usr/local/bin/ddnsctrl

1
config/rootfiles/common/stage2
View File

@@ -69,6 +69,7 @@ run
#sbin
#srv
#usr/bin
usr/bin/captive-cleanup
#usr/bin/perl
#usr/include
#usr/lib

13
config/rootfiles/common/ubuntu-font-family Normal file
View File

@@ -0,0 +1,13 @@
usr/share/fonts/Ubuntu-B.ttf
usr/share/fonts/Ubuntu-BI.ttf
usr/share/fonts/Ubuntu-C.ttf
usr/share/fonts/Ubuntu-L.ttf
usr/share/fonts/Ubuntu-LI.ttf
usr/share/fonts/Ubuntu-M.ttf
usr/share/fonts/Ubuntu-MI.ttf
usr/share/fonts/Ubuntu-R.ttf
usr/share/fonts/Ubuntu-RI.ttf
usr/share/fonts/UbuntuMono-B.ttf
usr/share/fonts/UbuntuMono-BI.ttf
usr/share/fonts/UbuntuMono-R.ttf
usr/share/fonts/UbuntuMono-RI.ttf

20
config/rootfiles/common/web-user-interface
View File

@@ -8,6 +8,11 @@ srv/web/ipfire/cgi-bin/aliases.cgi
srv/web/ipfire/cgi-bin/atm-status.cgi
srv/web/ipfire/cgi-bin/backup.cgi
srv/web/ipfire/cgi-bin/bluetooth.cgi
#srv/web/ipfire/cgi-bin/captive
srv/web/ipfire/cgi-bin/captive.cgi
srv/web/ipfire/cgi-bin/captive/index.cgi
srv/web/ipfire/cgi-bin/captive/logo.cgi
srv/web/ipfire/cgi-bin/captive/redirect.cgi
srv/web/ipfire/cgi-bin/chpasswd.cgi
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/connscheduler.cgi
@@ -23,8 +28,8 @@ srv/web/ipfire/cgi-bin/fireinfo.cgi
srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/geoip-block.cgi
#srv/web/ipfire/cgi-bin/guardian.cgi
srv/web/ipfire/cgi-bin/gpl.cgi
#srv/web/ipfire/cgi-bin/guardian.cgi
srv/web/ipfire/cgi-bin/gui.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/hosts.cgi
@@ -89,6 +94,19 @@ srv/web/ipfire/cgi-bin/wirelessclient.cgi
srv/web/ipfire/cgi-bin/wlanap.cgi
#srv/web/ipfire/html
srv/web/ipfire/html/blob.gif
#srv/web/ipfire/html/captive
#srv/web/ipfire/html/captive/assets
srv/web/ipfire/html/captive/assets/Ubuntu-L.ttf
srv/web/ipfire/html/captive/assets/Ubuntu-M.ttf
srv/web/ipfire/html/captive/assets/Ubuntu-R.ttf
srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css
srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css.map
srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css
srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css.map
srv/web/ipfire/html/captive/assets/captive.css
srv/web/ipfire/html/captive/assets/favicon.ico
srv/web/ipfire/html/captive/assets/ipfire.png
srv/web/ipfire/html/captive/template.html
srv/web/ipfire/html/clwarn.cgi
srv/web/ipfire/html/dial.cgi
srv/web/ipfire/html/favicon.ico

1
config/rootfiles/common/x86_64/stage2
View File

@@ -70,6 +70,7 @@ run
#sbin
#srv
#usr/bin
usr/bin/captive-cleanup
#usr/bin/perl
#usr/include
#usr/lib