diff --git a/config/config.php b/config/config.php index 178081b1..2dd0223c 100755 --- a/config/config.php +++ b/config/config.php @@ -32,6 +32,7 @@ define('RASPI_OPENVPN_CLIENT_CONFIG', '/etc/openvpn/client/client.conf'); define('RASPI_OPENVPN_CLIENT_LOGIN', '/etc/openvpn/client/login.conf'); define('RASPI_WIREGUARD_PATH', '/etc/wireguard/'); define('RASPI_WIREGUARD_CONFIG', RASPI_WIREGUARD_PATH.'wg0.conf'); +define('RASPI_IPTABLES_CONF', RASPI_CONFIG.'/networking/iptables_rules.json'); define('RASPI_TORPROXY_CONFIG', '/etc/tor/torrc'); define('RASPI_LIGHTTPD_CONFIG', '/etc/lighttpd/lighttpd.conf'); define('RASPI_ACCESS_CHECK_IP', '1.1.1.1'); @@ -40,6 +41,10 @@ define('RASPI_ACCESS_CHECK_DNS', 'one.one.one.one'); // Constant for the GitHub API latest release endpoint define('RASPI_API_ENDPOINT', 'https://api.github.com/repos/RaspAP/raspap-webgui/releases/latest'); +// Captive portal detection - returns 204 or 200 is successful +define('RASPI_ACCESS_CHECK_URL', 'http://detectportal.firefox.com'); +define('RASPI_ACCESS_CHECK_URL_CODE', 200); + // Constant for the 5GHz wireless regulatory domain define("RASPI_5GHZ_CHANNEL_MIN", 100); define("RASPI_5GHZ_CHANNEL_MAX", 192); diff --git a/includes/defaults.php b/includes/defaults.php index f658a51e..dc7683ec 100755 --- a/includes/defaults.php +++ b/includes/defaults.php @@ -37,11 +37,17 @@ $defaults = [ 'RASPI_OPENVPN_CLIENT_LOGIN' => '/etc/openvpn/client/login.conf', 'RASPI_WIREGUARD_PATH' => '/etc/wireguard/', 'RASPI_WIREGUARD_CONFIG' => RASPI_WIREGUARD_PATH.'wg0.conf', + 'RASPI_IPTABLES_CONF' => RASPI_CONFIG.'/networking/iptables_rules.json', + 'RASPI_TORPROXY_ENABLED' => false, 'RASPI_TORPROXY_CONFIG' => '/etc/tor/torrc', 'RASPI_LIGHTTPD_CONFIG' => '/etc/lighttpd/lighttpd.conf', 'RASPI_ACCESS_CHECK_IP' => '1.1.1.1', 'RASPI_ACCESS_CHECK_DNS' => 'one.one.one.one', + // Captive portal detection - returns 204 or 200 is successful + 'RASPI_ACCESS_CHECK_URL' => 'http://detectportal.firefox.com', + 'RASPI_ACCESS_CHECK_URL_CODE' => 200, + // Constants for the 5GHz wireless regulatory domain 'RASPI_5GHZ_CHANNEL_MIN' => 100, 'RASPI_5GHZ_CHANNEL_MAX' => 192, @@ -58,7 +64,6 @@ $defaults = [ 'RASPI_OPENVPN_ENABLED' => false, 'RASPI_VPN_PROVIDER_ENABLED' => false, 'RASPI_WIREGUARD_ENABLED' => false, - 'RASPI_TORPROXY_ENABLED' => false, 'RASPI_CONFAUTH_ENABLED' => true, 'RASPI_CHANGETHEME_ENABLED' => true, 'RASPI_VNSTAT_ENABLED' => true,