captive-portal: Move CGI files to CGI directory

Previously the assets directory has ExecCGI privileges
which is not at all required and potentially dangerous.

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

config/httpd/vhosts.d/captive.conf

@@ -3,12 +3,6 @@ Listen 1013
 <VirtualHost *:1013>
 	DocumentRoot /srv/web/ipfire/html/captive
 
-	<Directory /srv/web/ipfire/html/captive>
-		Options ExecCGI
-		Order allow,deny
-		Allow from all
-	</Directory>
-
 	ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/captive/
 	Alias /assets/ /srv/web/ipfire/html/captive/assets/
 
@@ -16,11 +10,16 @@ Listen 1013
 
 	# All unknown URIs will be redirected to the first
 	# redirector script.
-	ScriptAliasMatch .* /srv/web/ipfire/html/captive/index.cgi
+	ScriptAliasMatch .* /srv/web/ipfire/cgi-bin/captive/redirect.cgi
 
 	<Directory /srv/web/ipfire/cgi-bin/captive>
 		Options ExecCGI
 		Order allow,deny
 		Allow from all
 	</Directory>
+
+	<Directory /srv/web/ipfire/html/captive>
+		Order allow,deny
+		Allow from all
+	</Directory>
 </VirtualHost>

config/rootfiles/common/web-user-interface

@@ -11,6 +11,7 @@ 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/redirect.cgi
 srv/web/ipfire/cgi-bin/chpasswd.cgi
 srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/connscheduler.cgi
@@ -95,7 +96,6 @@ srv/web/ipfire/html/blob.gif
 srv/web/ipfire/html/captive/assets/captive.css
 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/clwarn.cgi
 srv/web/ipfire/html/dial.cgi
 srv/web/ipfire/html/favicon.ico