frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Federico Frigo
2022-04-06 09:21:29 +02:00
committed by GitHub
parent 5c22eafa31 6b276a8c4e
commit 592b2ccc77
12 changed files with 116 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/50-raspap-router.conf
View File

@@ -1,9 +1,8 @@
server.modules += (
"mod_rewrite",
"mod_rewrite",
)
$HTTP["url"] =~ "^/REPLACE_ME/(?!(dist|app|ajax|config)).*" {
url.rewrite-once = ( "^/REPLACE_ME/(.*?)(\?.+)?$"=>"/REPLACE_ME/index.php/$1$2" )
server.error-handler-404 = "/REPLACE_ME/index.php"
$HTTP["url"] =~ "^/(?!(dist|app|ajax|config)).*" {
url.rewrite-once = ( "^/(.*?)(\?.+)?$"=>"/index.php/$1$2" )
server.error-handler-404 = "/index.php"
}

6
config/config.php
View File

@@ -1,6 +1,6 @@
<?php
define('RASPI_BRAND_TEXT', 'RaspAP');
define('RASPI_BRAND_TEXT', 'Isobox');
define('RASPI_CONFIG', '/etc/raspap');
define('RASPI_CONFIG_NETWORK', RASPI_CONFIG.'/networking/defaults.json');
define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');
@@ -39,14 +39,14 @@ define('RASPI_HOTSPOT_ENABLED', true);
define('RASPI_NETWORK_ENABLED', true);
define('RASPI_DHCP_ENABLED', true);
define('RASPI_ADBLOCK_ENABLED', false);
define('RASPI_OPENVPN_ENABLED', false);
define('RASPI_OPENVPN_ENABLED', true);
define('RASPI_WIREGUARD_ENABLED', false);
define('RASPI_TORPROXY_ENABLED', false);
define('RASPI_CONFAUTH_ENABLED', true);
define('RASPI_CHANGETHEME_ENABLED', true);
define('RASPI_VNSTAT_ENABLED', true);
define('RASPI_SYSTEM_ENABLED', true);
define('RASPI_MONITOR_ENABLED', false);
define('RASPI_MONITOR_ENABLED', true);
// Locale settings
define('LOCALE_ROOT', 'locale');

6
config/defaults.json
View File

@@ -7,8 +7,8 @@
"subnetmask": [ "255.255.255.0" ]
},
"uap0": {
"static ip_address": [ "192.168.50.1/24" ],
"static routers": [ "192.168.50.1" ],
"static ip_address": [ "192.168.200.1/24" ],
"static routers": [ "192.168.200.1" ],
"static domain_name_server": [ "1.1.1.1 8.8.8.8" ],
"subnetmask": [ "255.255.255.0" ]
},
@@ -31,7 +31,7 @@
"dhcp-range": [ "10.3.141.50,10.3.141.255,255.255.255.0,12h" ]
},
"uap0": {
"dhcp-range": [ "192.168.50.50,192.168.50.150,12h" ]
"dhcp-range": [ "192.168.200.50,192.168.200.150,12h" ]
}
},
"wireguard": {

8
config/dhcpcd.conf
View File

@@ -10,9 +10,9 @@ require dhcp_server_identifier
slaac private
nohook lookup-hostname
# RaspAP wlan0 configuration
interface wlan0
static ip_address=10.3.141.1/24
static routers=10.3.141.1
# RaspAP uap0 configuration
interface uap0
static ip_address=192.168.200.1/24
static routers=192.168.200.1
static domain_name_server=9.9.9.9 1.1.1.1

9
config/hostapd.conf
View File

@@ -4,14 +4,15 @@ ctrl_interface_group=0
beacon_int=100
auth_algs=1
wpa_key_mgmt=WPA-PSK
ssid=raspi-webgui
ssid=isobox
channel=1
hw_mode=g
wpa_passphrase=ChangeMe
interface=wlan0
wpa_passphrase=isobox-password
interface=uap0
wpa=2
wpa_pairwise=CCMP
country_code=
country_code=IT
ignore_broadcast_ssid=0
## Rapberry Pi 3 specific to on board WLAN/WiFi
#ieee80211n=1 # 802.11n support (Raspberry Pi 3)
#wmm_enabled=1 # QoS support (Raspberry Pi 3)