Rootfile update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 7ede7fa28f101f9539983c9a08df56c2b51a1d8f..8b46b8b3949eaee9b3f3c51c8dc641d09b8270fa 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -43,9 +43,9 @@ 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/captive.conf
 #etc/httpd/conf/vhosts.d/nagios.conf
 #etc/httpd/conf/vhosts.d/openmailadmin.conf
 #srv/web
@@ -92,6 +92,9 @@ etc/httpd/conf/vhosts.d/captive.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/html/captive/logo
 #srv/web/ipfire/icons
 #srv/web/ipfire/icons/README
 #srv/web/ipfire/icons/README.html

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 61cc9310ff00ca014608b8298d27951ea2a8bc25..58424ed2b67a9ccf342be07f7edf78d658550af4 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -10,11 +10,12 @@ var/ipfire/auth
 #var/ipfire/backup
 var/ipfire/backup/exclude.user
 var/ipfire/backup/include.user
+var/ipfire/ca
 var/ipfire/captive
-var/ipfire/captive/settings
+var/ipfire/captive/agb.txt
 var/ipfire/captive/clients
+var/ipfire/captive/settings
 var/ipfire/captive/voucher_out
-var/ipfire/ca
 var/ipfire/certs
 #var/ipfire/certs/index.txt
 #var/ipfire/certs/serial
@@ -55,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
@@ -120,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

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index a76d46e2be217cee0919758c8045a2cc31d2f143..8c6dd40afdec5dc027f778216b20de99299b8608 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -69,10 +69,10 @@ run
 #sbin
 #srv
 #usr/bin
+usr/bin/captive-cleanup
 #usr/bin/perl
 #usr/include
 #usr/lib
-usr/bin/captive-cleanup
 usr/lib/firewall
 usr/lib/firewall/firewall-lib.pl
 usr/lib/firewall/ipsec-block

diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 3975738cdcb08c70fa06e2f0b26652a9a3dffdf1..1c5e4ce208eb7a77c2bcb807dde184d61583d6e6 100644 (file)
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -8,8 +8,9 @@ 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/index.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/chpasswd.cgi
 srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/connscheduler.cgi
@@ -89,16 +90,15 @@ srv/web/ipfire/cgi-bin/webaccess.cgi
 srv/web/ipfire/cgi-bin/wireless.cgi
 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/clwarn.cgi
-srv/web/ipfire/html/dial.cgi
-srv/web/ipfire/html/favicon.ico
+#srv/web/ipfire/html/captive/assets
 srv/web/ipfire/html/captive/assets/captive.css
-srv/web/ipfire/html/captive/assets/internet.png
 srv/web/ipfire/html/captive/assets/favicon.ico
+srv/web/ipfire/html/captive/assets/internet.png
 srv/web/ipfire/html/captive/index.cgi
-srv/web/ipfire/html/captive/logo
+srv/web/ipfire/html/clwarn.cgi
+srv/web/ipfire/html/dial.cgi
+srv/web/ipfire/html/favicon.ico
 #srv/web/ipfire/html/images
 srv/web/ipfire/html/images/IPFire.png
 srv/web/ipfire/html/images/add.gif