Merge branch 'master' into feature/notracking

This commit is contained in:
Bill Zimmerman
2020-04-01 00:28:22 +02:00
committed by GitHub
12 changed files with 495 additions and 335 deletions

View File

@@ -5,7 +5,7 @@ if (!defined('RASPI_CONFIG')) {
}
$defaults = [
'RASPI_VERSION' => '2.3',
'RASPI_VERSION' => '2.3.1',
'RASPI_CONFIG_NETWORKING' => RASPI_CONFIG.'/networking',
'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth',
'RASPI_WIFI_CLIENT_INTERFACE' => 'wlan0',
@@ -33,7 +33,7 @@ $defaults = [
'RASPI_HOTSPOT_ENABLED' => true,
'RASPI_NETWORK_ENABLED' => true,
'RASPI_DHCP_ENABLED' => true,
'RASPI_ADBLOCK_ENABLED' => true,
'RASPI_ADBLOCK_ENABLED' => false,
'RASPI_OPENVPN_ENABLED' => false,
'RASPI_TORPROXY_ENABLED' => false,
'RASPI_CONFAUTH_ENABLED' => true,