From 1adcfd77a5b7a6f4d4641f606a8b18b0d01b34a4 Mon Sep 17 00:00:00 2001 From: Joe Ayers Date: Sat, 27 Jun 2020 16:15:48 -0700 Subject: [PATCH] aredn: remove config files no longer in use consuming flash clean up 176k of flash space. Config files include modes forA P, Client, Mesh_Ap, and ROuter. Files are no longer referenced or used. --- files/etc/arednsysupgrade.conf | 12 --- files/etc/config.ap/_setup | 24 ------ files/etc/config.ap/_setup.default | 25 ------- files/etc/config.ap/_setup.dhcp | 0 files/etc/config.ap/_setup.ports | 0 files/etc/config.ap/dhcp | 10 --- files/etc/config.ap/dropbear | 3 - files/etc/config.ap/firewall | 99 ------------------------- files/etc/config.ap/firewall.user | 4 - files/etc/config.ap/network | 28 ------- files/etc/config.ap/system | 24 ------ files/etc/config.ap/uhttpd | 13 ---- files/etc/config.ap/wireless | 15 ---- files/etc/config.client/_setup | 21 ------ files/etc/config.client/_setup.default | 22 ------ files/etc/config.client/_setup.dhcp | 0 files/etc/config.client/_setup.ports | 0 files/etc/config.client/dhcp | 14 ---- files/etc/config.client/dropbear | 3 - files/etc/config.client/firewall | 99 ------------------------- files/etc/config.client/firewall.user | 4 - files/etc/config.client/network | 23 ------ files/etc/config.client/system | 24 ------ files/etc/config.client/uhttpd | 13 ---- files/etc/config.client/wireless | 12 --- files/etc/config.mesh_ap/_setup | 25 ------- files/etc/config.mesh_ap/_setup.default | 26 ------- files/etc/config.mesh_ap/_setup.dhcp | 0 files/etc/config.mesh_ap/_setup.ports | 0 files/etc/config.mesh_ap/dhcp | 10 --- files/etc/config.mesh_ap/dropbear | 3 - files/etc/config.mesh_ap/firewall | 97 ------------------------ files/etc/config.mesh_ap/firewall.user | 4 - files/etc/config.mesh_ap/network | 25 ------- files/etc/config.mesh_ap/system | 24 ------ files/etc/config.mesh_ap/uhttpd | 13 ---- files/etc/config.mesh_ap/wireless | 15 ---- files/etc/config.router/_setup | 17 ----- files/etc/config.router/_setup.default | 18 ----- files/etc/config.router/_setup.dhcp | 0 files/etc/config.router/_setup.ports | 0 files/etc/config.router/dhcp | 10 --- files/etc/config.router/dropbear | 3 - files/etc/config.router/firewall | 99 ------------------------- files/etc/config.router/firewall.user | 4 - files/etc/config.router/network | 28 ------- files/etc/config.router/system | 24 ------ files/etc/config.router/uhttpd | 13 ---- files/etc/config.router/wireless | 14 ---- files/lib/upgrade/keep.d/bbhn-base | 12 --- files/www/cgi-bin/supporttool | 4 - 51 files changed, 980 deletions(-) delete mode 100644 files/etc/config.ap/_setup delete mode 100644 files/etc/config.ap/_setup.default delete mode 100644 files/etc/config.ap/_setup.dhcp delete mode 100644 files/etc/config.ap/_setup.ports delete mode 100644 files/etc/config.ap/dhcp delete mode 100644 files/etc/config.ap/dropbear delete mode 100644 files/etc/config.ap/firewall delete mode 100755 files/etc/config.ap/firewall.user delete mode 100644 files/etc/config.ap/network delete mode 100644 files/etc/config.ap/system delete mode 100644 files/etc/config.ap/uhttpd delete mode 100644 files/etc/config.ap/wireless delete mode 100644 files/etc/config.client/_setup delete mode 100644 files/etc/config.client/_setup.default delete mode 100644 files/etc/config.client/_setup.dhcp delete mode 100644 files/etc/config.client/_setup.ports delete mode 100644 files/etc/config.client/dhcp delete mode 100644 files/etc/config.client/dropbear delete mode 100644 files/etc/config.client/firewall delete mode 100755 files/etc/config.client/firewall.user delete mode 100644 files/etc/config.client/network delete mode 100644 files/etc/config.client/system delete mode 100644 files/etc/config.client/uhttpd delete mode 100644 files/etc/config.client/wireless delete mode 100644 files/etc/config.mesh_ap/_setup delete mode 100644 files/etc/config.mesh_ap/_setup.default delete mode 100644 files/etc/config.mesh_ap/_setup.dhcp delete mode 100644 files/etc/config.mesh_ap/_setup.ports delete mode 100644 files/etc/config.mesh_ap/dhcp delete mode 100644 files/etc/config.mesh_ap/dropbear delete mode 100644 files/etc/config.mesh_ap/firewall delete mode 100755 files/etc/config.mesh_ap/firewall.user delete mode 100644 files/etc/config.mesh_ap/network delete mode 100644 files/etc/config.mesh_ap/system delete mode 100644 files/etc/config.mesh_ap/uhttpd delete mode 100644 files/etc/config.mesh_ap/wireless delete mode 100644 files/etc/config.router/_setup delete mode 100644 files/etc/config.router/_setup.default delete mode 100644 files/etc/config.router/_setup.dhcp delete mode 100644 files/etc/config.router/_setup.ports delete mode 100644 files/etc/config.router/dhcp delete mode 100644 files/etc/config.router/dropbear delete mode 100644 files/etc/config.router/firewall delete mode 100755 files/etc/config.router/firewall.user delete mode 100644 files/etc/config.router/network delete mode 100644 files/etc/config.router/system delete mode 100644 files/etc/config.router/uhttpd delete mode 100644 files/etc/config.router/wireless diff --git a/files/etc/arednsysupgrade.conf b/files/etc/arednsysupgrade.conf index 944c4fa7..f4b26158 100644 --- a/files/etc/arednsysupgrade.conf +++ b/files/etc/arednsysupgrade.conf @@ -1,14 +1,5 @@ # This file contains a list of files to retain over a sysupgrade with "Keep Settings" in the GUI. # This list will be used instead of the list normally used by sysupgrade. -/etc/config.ap/_setup -/etc/config.ap/_setup.dhcp -/etc/config.ap/_setup.ports -/etc/config.client/_setup -/etc/config.client/_setup.dhcp -/etc/config.client/_setup.ports -/etc/config.mesh_ap/_setup -/etc/config.mesh_ap/_setup.dhcp -/etc/config.mesh_ap/_setup.ports /etc/config.mesh/_setup /etc/config.mesh/_setup.dhcp.dmz /etc/config.mesh/_setup.dhcp.nat @@ -18,9 +9,6 @@ /etc/config.mesh/_setup.services.nat /etc/config.mesh/vtun /etc/config.mesh/aredn -/etc/config.router/_setup -/etc/config.router/_setup.dhcp -/etc/config.router/_setup.ports /etc/dropbear/dropbear_dss_host_key /etc/dropbear/dropbear_rsa_host_key /etc/dropbear/authorized_keys diff --git a/files/etc/config.ap/_setup b/files/etc/config.ap/_setup deleted file mode 100644 index b5e4b085..00000000 --- a/files/etc/config.ap/_setup +++ /dev/null @@ -1,24 +0,0 @@ -wifi_proto = bridge -wifi_mode = ap -wifi_ssid = -wifi_txpower = 19 -wifi_channel = 6 -wifi_chanbw = 20 -wifi_distance = 0 -wifi_hidden = 0 - -lan_proto = static -lan_ip = 172.27.1.1 -lan_mask = 255.255.255.0 -lan_dhcp = 1 - -dhcp_start = 5 -dhcp_end = 25 -dhcp_limit = 20 - -wan_proto = dhcp -wan_dns1 = 8.8.8.8 -wan_dns2 = 8.8.4.4 - -time_zone = UTC -ntp_server = us.pool.ntp.org diff --git a/files/etc/config.ap/_setup.default b/files/etc/config.ap/_setup.default deleted file mode 100644 index db62a4dd..00000000 --- a/files/etc/config.ap/_setup.default +++ /dev/null @@ -1,25 +0,0 @@ -wifi_proto = bridge -wifi_mode = ap -wifi_ssid = -wifi_txpower = 19 -wifi_channel = 6 -wifi_chanbw = 20 -wifi_distance = 0 -wifi_hidden = 0 - -lan_proto = static -lan_ip = 172.27.1.1 -lan_mask = 255.255.255.0 -lan_dhcp = 1 -lan_dhcp_noroute = 0 - -dhcp_start = 5 -dhcp_end = 25 -dhcp_limit = 20 - -wan_proto = dhcp -wan_dns1 = 8.8.8.8 -wan_dns2 = 8.8.4.4 - -time_zone = UTC -ntp_server = us.pool.ntp.org diff --git a/files/etc/config.ap/_setup.dhcp b/files/etc/config.ap/_setup.dhcp deleted file mode 100644 index e69de29b..00000000 diff --git a/files/etc/config.ap/_setup.ports b/files/etc/config.ap/_setup.ports deleted file mode 100644 index e69de29b..00000000 diff --git a/files/etc/config.ap/dhcp b/files/etc/config.ap/dhcp deleted file mode 100644 index b6fe0593..00000000 --- a/files/etc/config.ap/dhcp +++ /dev/null @@ -1,10 +0,0 @@ -config dhcp - option interface lan - option start - option limit - option leasetime 1h - option ignore - -config dhcp - option interface wan - option ignore 1 diff --git a/files/etc/config.ap/dropbear b/files/etc/config.ap/dropbear deleted file mode 100644 index 2bf01221..00000000 --- a/files/etc/config.ap/dropbear +++ /dev/null @@ -1,3 +0,0 @@ -config dropbear - option PasswordAuth 'on' - option Port '2222' diff --git a/files/etc/config.ap/firewall b/files/etc/config.ap/firewall deleted file mode 100644 index cf8432e8..00000000 --- a/files/etc/config.ap/firewall +++ /dev/null @@ -1,99 +0,0 @@ -config defaults - option syn_flood 1 - option input ACCEPT - option output ACCEPT - option forward REJECT -# Uncomment this line to disable ipv6 rules -# option disable_ipv6 1 - -config zone - option name lan - option network 'lan' - option input ACCEPT - option output ACCEPT - option forward REJECT - -config zone - option name wan - option network 'wan' - option input REJECT - option output ACCEPT - option forward REJECT - option masq 1 - option mtu_fix 1 - -config zone - option name wifi - option network 'wifi' - option input REJECT - option output ACCEPT - option forward REJECT - option masq 1 - option mtu_fix 1 - - -config forwarding - option src lan - option dest wifi - - -# Allow IPv4 ping -config rule - option name Allow-Ping - option src wifi - option proto icmp - option icmp_type echo-request - option family ipv4 - option target ACCEPT - -config include - option path /etc/firewall.user - - -config rule - option src wan - option dest_port 2222 - option proto tcp - option target ACCEPT - -config rule - option src wan - option dest_port 8080 - option proto tcp - option target ACCEPT - -config rule - option src wan - option dest_port 80 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 2222 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 8080 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 80 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 698 - option proto udp - option target ACCEPT - -config rule - option src wifi - option dest_port 1978 - option proto tcp - option target ACCEPT diff --git a/files/etc/config.ap/firewall.user b/files/etc/config.ap/firewall.user deleted file mode 100755 index 1ccbd016..00000000 --- a/files/etc/config.ap/firewall.user +++ /dev/null @@ -1,4 +0,0 @@ -# This file is interpreted as shell script. -# Put your custom iptables rules here, they will -# be executed with each firewall (re-)start. - diff --git a/files/etc/config.ap/network b/files/etc/config.ap/network deleted file mode 100644 index 47a08581..00000000 --- a/files/etc/config.ap/network +++ /dev/null @@ -1,28 +0,0 @@ -#### Loopback configuration -config interface loopback - option ifname "lo" - option proto static - option ipaddr 127.0.0.1 - option netmask 255.0.0.0 - - -#### LAN configuration -config interface lan - option type bridge - option ifname "" - option proto - option ipaddr - option netmask - option dns " " - option gateway - - -#### WAN configuration -config interface wan - option ifname "" - option proto - option ipaddr - option netmask - option gateway - -include /etc/aredn_include/swconfig diff --git a/files/etc/config.ap/system b/files/etc/config.ap/system deleted file mode 100644 index 17090087..00000000 --- a/files/etc/config.ap/system +++ /dev/null @@ -1,24 +0,0 @@ -config 'system' - option 'hostname' '' - option 'timezone' '' - -config 'timeserver' 'ntp' - list 'server' '' - option enable_server 0 - option enabled 0 - -config button - option button 'reset' - option action 'released' - option handler '/usr/local/bin/bbhnrecoverymode' - option min '3' - option max '7' - -config button - option button 'reset' - option action 'released' - option handler 'firstboot -y && reboot' - option min '12' - option max '20' - -include /etc/aredn_include/system_netled diff --git a/files/etc/config.ap/uhttpd b/files/etc/config.ap/uhttpd deleted file mode 100644 index 7e65aafb..00000000 --- a/files/etc/config.ap/uhttpd +++ /dev/null @@ -1,13 +0,0 @@ -# Server configuration -config uhttpd main - - # HTTP listen addresses, multiple allowed - list listen_http 0.0.0.0:8080 - list listen_http 0.0.0.0:80 - option home /www - option rfc1918_filter 1 - option cgi_prefix /cgi-bin - option script_timeout 240 - option network_timeout 30 - option tcp_keepalive 5 -# option config /etc/httpd.conf diff --git a/files/etc/config.ap/wireless b/files/etc/config.ap/wireless deleted file mode 100644 index 8a2e9c95..00000000 --- a/files/etc/config.ap/wireless +++ /dev/null @@ -1,15 +0,0 @@ -config wifi-device radio0 - option type mac80211 - option channel - option chanbw - option distance -include /etc/aredn_include/radio0path - -config wifi-iface - option device radio0 - option network lan - option mode - option ssid "" - option hidden - option encryption none - diff --git a/files/etc/config.client/_setup b/files/etc/config.client/_setup deleted file mode 100644 index 15620f52..00000000 --- a/files/etc/config.client/_setup +++ /dev/null @@ -1,21 +0,0 @@ -wifi_proto = dhcp -wifi_mode = sta -wifi_ssid = ubiquiti -wifi_txpower = 27 -wifi_distance = 0 - -lan_proto = static -lan_ip = 172.27.2.1 -lan_mask = 255.255.255.0 -lan_dhcp = 1 - -dhcp_start = 5 -dhcp_end = 25 -dhcp_limit = 20 - -wan_proto = disabled -wan_dns1 = 8.8.8.8 -wan_dns2 = 8.8.4.4 - -time_zone = UTC -ntp_server = us.pool.ntp.org diff --git a/files/etc/config.client/_setup.default b/files/etc/config.client/_setup.default deleted file mode 100644 index abaa003c..00000000 --- a/files/etc/config.client/_setup.default +++ /dev/null @@ -1,22 +0,0 @@ -wifi_proto = dhcp -wifi_mode = sta -wifi_ssid = ubiquiti -wifi_txpower = 27 -wifi_distance = 0 - -lan_proto = static -lan_ip = 172.27.2.1 -lan_mask = 255.255.255.0 -lan_dhcp = 1 -lan_dhcp_noroute = 0 - -dhcp_start = 5 -dhcp_end = 25 -dhcp_limit = 20 - -wan_proto = disabled -wan_dns1 = 8.8.8.8 -wan_dns2 = 8.8.4.4 - -time_zone = UTC -ntp_server = us.pool.ntp.org diff --git a/files/etc/config.client/_setup.dhcp b/files/etc/config.client/_setup.dhcp deleted file mode 100644 index e69de29b..00000000 diff --git a/files/etc/config.client/_setup.ports b/files/etc/config.client/_setup.ports deleted file mode 100644 index e69de29b..00000000 diff --git a/files/etc/config.client/dhcp b/files/etc/config.client/dhcp deleted file mode 100644 index efb21c2f..00000000 --- a/files/etc/config.client/dhcp +++ /dev/null @@ -1,14 +0,0 @@ -config dhcp - option interface lan - option start - option limit - option leasetime 1h - option ignore - -config dhcp - option interface wan - option ignore 1 - -config dhcp - option interface wifi - option ignore 1 diff --git a/files/etc/config.client/dropbear b/files/etc/config.client/dropbear deleted file mode 100644 index 2bf01221..00000000 --- a/files/etc/config.client/dropbear +++ /dev/null @@ -1,3 +0,0 @@ -config dropbear - option PasswordAuth 'on' - option Port '2222' diff --git a/files/etc/config.client/firewall b/files/etc/config.client/firewall deleted file mode 100644 index cf8432e8..00000000 --- a/files/etc/config.client/firewall +++ /dev/null @@ -1,99 +0,0 @@ -config defaults - option syn_flood 1 - option input ACCEPT - option output ACCEPT - option forward REJECT -# Uncomment this line to disable ipv6 rules -# option disable_ipv6 1 - -config zone - option name lan - option network 'lan' - option input ACCEPT - option output ACCEPT - option forward REJECT - -config zone - option name wan - option network 'wan' - option input REJECT - option output ACCEPT - option forward REJECT - option masq 1 - option mtu_fix 1 - -config zone - option name wifi - option network 'wifi' - option input REJECT - option output ACCEPT - option forward REJECT - option masq 1 - option mtu_fix 1 - - -config forwarding - option src lan - option dest wifi - - -# Allow IPv4 ping -config rule - option name Allow-Ping - option src wifi - option proto icmp - option icmp_type echo-request - option family ipv4 - option target ACCEPT - -config include - option path /etc/firewall.user - - -config rule - option src wan - option dest_port 2222 - option proto tcp - option target ACCEPT - -config rule - option src wan - option dest_port 8080 - option proto tcp - option target ACCEPT - -config rule - option src wan - option dest_port 80 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 2222 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 8080 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 80 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 698 - option proto udp - option target ACCEPT - -config rule - option src wifi - option dest_port 1978 - option proto tcp - option target ACCEPT diff --git a/files/etc/config.client/firewall.user b/files/etc/config.client/firewall.user deleted file mode 100755 index 1ccbd016..00000000 --- a/files/etc/config.client/firewall.user +++ /dev/null @@ -1,4 +0,0 @@ -# This file is interpreted as shell script. -# Put your custom iptables rules here, they will -# be executed with each firewall (re-)start. - diff --git a/files/etc/config.client/network b/files/etc/config.client/network deleted file mode 100644 index b419368c..00000000 --- a/files/etc/config.client/network +++ /dev/null @@ -1,23 +0,0 @@ -#### Loopback configuration -config interface loopback - option ifname "lo" - option proto static - option ipaddr 127.0.0.1 - option netmask 255.0.0.0 - - -#### LAN configuration -config interface lan - option ifname "" - option proto - option ipaddr - option netmask - option dns " " - - -#### WAN configuration -config interface wan - option ifname "" - option proto - -include /etc/aredn_include/swconfig diff --git a/files/etc/config.client/system b/files/etc/config.client/system deleted file mode 100644 index 17090087..00000000 --- a/files/etc/config.client/system +++ /dev/null @@ -1,24 +0,0 @@ -config 'system' - option 'hostname' '' - option 'timezone' '' - -config 'timeserver' 'ntp' - list 'server' '' - option enable_server 0 - option enabled 0 - -config button - option button 'reset' - option action 'released' - option handler '/usr/local/bin/bbhnrecoverymode' - option min '3' - option max '7' - -config button - option button 'reset' - option action 'released' - option handler 'firstboot -y && reboot' - option min '12' - option max '20' - -include /etc/aredn_include/system_netled diff --git a/files/etc/config.client/uhttpd b/files/etc/config.client/uhttpd deleted file mode 100644 index 7e65aafb..00000000 --- a/files/etc/config.client/uhttpd +++ /dev/null @@ -1,13 +0,0 @@ -# Server configuration -config uhttpd main - - # HTTP listen addresses, multiple allowed - list listen_http 0.0.0.0:8080 - list listen_http 0.0.0.0:80 - option home /www - option rfc1918_filter 1 - option cgi_prefix /cgi-bin - option script_timeout 240 - option network_timeout 30 - option tcp_keepalive 5 -# option config /etc/httpd.conf diff --git a/files/etc/config.client/wireless b/files/etc/config.client/wireless deleted file mode 100644 index 7c783c00..00000000 --- a/files/etc/config.client/wireless +++ /dev/null @@ -1,12 +0,0 @@ -config wifi-device radio0 - option type mac80211 - option distance -include /etc/aredn_include/radio0path - -config wifi-iface - option device radio0 - option network wan - option mode - option ssid "" - option encryption none - diff --git a/files/etc/config.mesh_ap/_setup b/files/etc/config.mesh_ap/_setup deleted file mode 100644 index bcc35580..00000000 --- a/files/etc/config.mesh_ap/_setup +++ /dev/null @@ -1,25 +0,0 @@ -wifi_proto = bridge -wifi_mode = ap -wifi_ssid = -wifi_txpower = 19 -wifi_channel = 6 -wifi_chanbw = 20 -wifi_distance = 0 -wifi_hidden = 0 - -lan_proto = static -lan_ip = 172.27.0.2 -lan_mask = 255.255.255.0 -lan_dhcp = 0 -lan_gw = 172.27.0.1 - -dhcp_start = 5 -dhcp_end = 25 -dhcp_limit = 20 - -wan_proto = disabled -wan_dns1 = 8.8.8.8 -wan_dns2 = 8.8.4.4 - -time_zone = UTC -ntp_server = us.pool.ntp.org diff --git a/files/etc/config.mesh_ap/_setup.default b/files/etc/config.mesh_ap/_setup.default deleted file mode 100644 index 280c9d56..00000000 --- a/files/etc/config.mesh_ap/_setup.default +++ /dev/null @@ -1,26 +0,0 @@ -wifi_proto = bridge -wifi_mode = ap -wifi_ssid = -wifi_txpower = 19 -wifi_channel = 6 -wifi_chanbw = 20 -wifi_distance = 0 -wifi_hidden = 0 - -lan_proto = static -lan_ip = 172.27.0.2 -lan_mask = 255.255.255.0 -lan_dhcp = 0 -lan_gw = 172.27.0.1 -lan_dhcp_noroute = 0 - -dhcp_start = 5 -dhcp_end = 25 -dhcp_limit = 20 - -wan_proto = disabled -wan_dns1 = 8.8.8.8 -wan_dns2 = 8.8.4.4 - -time_zone = UTC -ntp_server = us.pool.ntp.org diff --git a/files/etc/config.mesh_ap/_setup.dhcp b/files/etc/config.mesh_ap/_setup.dhcp deleted file mode 100644 index e69de29b..00000000 diff --git a/files/etc/config.mesh_ap/_setup.ports b/files/etc/config.mesh_ap/_setup.ports deleted file mode 100644 index e69de29b..00000000 diff --git a/files/etc/config.mesh_ap/dhcp b/files/etc/config.mesh_ap/dhcp deleted file mode 100644 index b6fe0593..00000000 --- a/files/etc/config.mesh_ap/dhcp +++ /dev/null @@ -1,10 +0,0 @@ -config dhcp - option interface lan - option start - option limit - option leasetime 1h - option ignore - -config dhcp - option interface wan - option ignore 1 diff --git a/files/etc/config.mesh_ap/dropbear b/files/etc/config.mesh_ap/dropbear deleted file mode 100644 index 2bf01221..00000000 --- a/files/etc/config.mesh_ap/dropbear +++ /dev/null @@ -1,3 +0,0 @@ -config dropbear - option PasswordAuth 'on' - option Port '2222' diff --git a/files/etc/config.mesh_ap/firewall b/files/etc/config.mesh_ap/firewall deleted file mode 100644 index 73fe4cf7..00000000 --- a/files/etc/config.mesh_ap/firewall +++ /dev/null @@ -1,97 +0,0 @@ -config defaults - option syn_flood 1 - option input ACCEPT - option output ACCEPT - option forward REJECT -# Uncomment this line to disable ipv6 rules -# option disable_ipv6 1 - -config zone - option name lan - option network 'lan' - option input ACCEPT - option output ACCEPT - option forward REJECT - -config zone - option name wan - option network 'wan' - option input REJECT - option output ACCEPT - option forward REJECT - option masq 1 - option mtu_fix 1 - -config zone - option name wifi - option network 'wifi' - option input REJECT - option output ACCEPT - option forward REJECT - option masq 1 - option mtu_fix 1 - -config forwarding - option src lan - option dest lan - -# Allow IPv4 ping -config rule - option name Allow-Ping - option src wifi - option proto icmp - option icmp_type echo-request - option family ipv4 - option target ACCEPT - -config include - option path /etc/firewall.user - - -config rule - option src wan - option dest_port 2222 - option proto tcp - option target ACCEPT - -config rule - option src wan - option dest_port 8080 - option proto tcp - option target ACCEPT - -config rule - option src wan - option dest_port 80 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 2222 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 8080 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 80 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 698 - option proto udp - option target ACCEPT - -config rule - option src wifi - option dest_port 1978 - option proto tcp - option target ACCEPT diff --git a/files/etc/config.mesh_ap/firewall.user b/files/etc/config.mesh_ap/firewall.user deleted file mode 100755 index 1ccbd016..00000000 --- a/files/etc/config.mesh_ap/firewall.user +++ /dev/null @@ -1,4 +0,0 @@ -# This file is interpreted as shell script. -# Put your custom iptables rules here, they will -# be executed with each firewall (re-)start. - diff --git a/files/etc/config.mesh_ap/network b/files/etc/config.mesh_ap/network deleted file mode 100644 index 49001fd9..00000000 --- a/files/etc/config.mesh_ap/network +++ /dev/null @@ -1,25 +0,0 @@ -#### Loopback configuration -config interface loopback - option ifname "lo" - option proto static - option ipaddr 127.0.0.1 - option netmask 255.0.0.0 - - -#### LAN configuration -config interface lan - option type bridge - option ifname "" - option proto - option ipaddr - option netmask - option gateway - option dns - - -#### WAN configuration -config interface wan - option ifname "" - option proto - -include /etc/aredn_include/swconfig diff --git a/files/etc/config.mesh_ap/system b/files/etc/config.mesh_ap/system deleted file mode 100644 index 17090087..00000000 --- a/files/etc/config.mesh_ap/system +++ /dev/null @@ -1,24 +0,0 @@ -config 'system' - option 'hostname' '' - option 'timezone' '' - -config 'timeserver' 'ntp' - list 'server' '' - option enable_server 0 - option enabled 0 - -config button - option button 'reset' - option action 'released' - option handler '/usr/local/bin/bbhnrecoverymode' - option min '3' - option max '7' - -config button - option button 'reset' - option action 'released' - option handler 'firstboot -y && reboot' - option min '12' - option max '20' - -include /etc/aredn_include/system_netled diff --git a/files/etc/config.mesh_ap/uhttpd b/files/etc/config.mesh_ap/uhttpd deleted file mode 100644 index 7e65aafb..00000000 --- a/files/etc/config.mesh_ap/uhttpd +++ /dev/null @@ -1,13 +0,0 @@ -# Server configuration -config uhttpd main - - # HTTP listen addresses, multiple allowed - list listen_http 0.0.0.0:8080 - list listen_http 0.0.0.0:80 - option home /www - option rfc1918_filter 1 - option cgi_prefix /cgi-bin - option script_timeout 240 - option network_timeout 30 - option tcp_keepalive 5 -# option config /etc/httpd.conf diff --git a/files/etc/config.mesh_ap/wireless b/files/etc/config.mesh_ap/wireless deleted file mode 100644 index 8a2e9c95..00000000 --- a/files/etc/config.mesh_ap/wireless +++ /dev/null @@ -1,15 +0,0 @@ -config wifi-device radio0 - option type mac80211 - option channel - option chanbw - option distance -include /etc/aredn_include/radio0path - -config wifi-iface - option device radio0 - option network lan - option mode - option ssid "" - option hidden - option encryption none - diff --git a/files/etc/config.router/_setup b/files/etc/config.router/_setup deleted file mode 100644 index 16e69666..00000000 --- a/files/etc/config.router/_setup +++ /dev/null @@ -1,17 +0,0 @@ -wifi_proto = disabled - -lan_proto = static -lan_ip = 172.27.3.1 -lan_mask = 255.255.255.0 -lan_dhcp = 1 - -dhcp_start = 5 -dhcp_end = 25 -dhcp_limit = 20 - -wan_proto = dhcp -wan_dns1 = 8.8.8.8 -wan_dns2 = 8.8.4.4 - -time_zone = UTC -ntp_server = us.pool.ntp.org diff --git a/files/etc/config.router/_setup.default b/files/etc/config.router/_setup.default deleted file mode 100644 index 81c84842..00000000 --- a/files/etc/config.router/_setup.default +++ /dev/null @@ -1,18 +0,0 @@ -wifi_proto = disabled - -lan_proto = static -lan_ip = 172.27.3.1 -lan_mask = 255.255.255.0 -lan_dhcp = 1 -lan_dhcp_noroute = 0 - -dhcp_start = 5 -dhcp_end = 25 -dhcp_limit = 20 - -wan_proto = dhcp -wan_dns1 = 8.8.8.8 -wan_dns2 = 8.8.4.4 - -time_zone = UTC -ntp_server = us.pool.ntp.org diff --git a/files/etc/config.router/_setup.dhcp b/files/etc/config.router/_setup.dhcp deleted file mode 100644 index e69de29b..00000000 diff --git a/files/etc/config.router/_setup.ports b/files/etc/config.router/_setup.ports deleted file mode 100644 index e69de29b..00000000 diff --git a/files/etc/config.router/dhcp b/files/etc/config.router/dhcp deleted file mode 100644 index b6fe0593..00000000 --- a/files/etc/config.router/dhcp +++ /dev/null @@ -1,10 +0,0 @@ -config dhcp - option interface lan - option start - option limit - option leasetime 1h - option ignore - -config dhcp - option interface wan - option ignore 1 diff --git a/files/etc/config.router/dropbear b/files/etc/config.router/dropbear deleted file mode 100644 index 2bf01221..00000000 --- a/files/etc/config.router/dropbear +++ /dev/null @@ -1,3 +0,0 @@ -config dropbear - option PasswordAuth 'on' - option Port '2222' diff --git a/files/etc/config.router/firewall b/files/etc/config.router/firewall deleted file mode 100644 index cf8432e8..00000000 --- a/files/etc/config.router/firewall +++ /dev/null @@ -1,99 +0,0 @@ -config defaults - option syn_flood 1 - option input ACCEPT - option output ACCEPT - option forward REJECT -# Uncomment this line to disable ipv6 rules -# option disable_ipv6 1 - -config zone - option name lan - option network 'lan' - option input ACCEPT - option output ACCEPT - option forward REJECT - -config zone - option name wan - option network 'wan' - option input REJECT - option output ACCEPT - option forward REJECT - option masq 1 - option mtu_fix 1 - -config zone - option name wifi - option network 'wifi' - option input REJECT - option output ACCEPT - option forward REJECT - option masq 1 - option mtu_fix 1 - - -config forwarding - option src lan - option dest wifi - - -# Allow IPv4 ping -config rule - option name Allow-Ping - option src wifi - option proto icmp - option icmp_type echo-request - option family ipv4 - option target ACCEPT - -config include - option path /etc/firewall.user - - -config rule - option src wan - option dest_port 2222 - option proto tcp - option target ACCEPT - -config rule - option src wan - option dest_port 8080 - option proto tcp - option target ACCEPT - -config rule - option src wan - option dest_port 80 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 2222 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 8080 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 80 - option proto tcp - option target ACCEPT - -config rule - option src wifi - option dest_port 698 - option proto udp - option target ACCEPT - -config rule - option src wifi - option dest_port 1978 - option proto tcp - option target ACCEPT diff --git a/files/etc/config.router/firewall.user b/files/etc/config.router/firewall.user deleted file mode 100755 index 1ccbd016..00000000 --- a/files/etc/config.router/firewall.user +++ /dev/null @@ -1,4 +0,0 @@ -# This file is interpreted as shell script. -# Put your custom iptables rules here, they will -# be executed with each firewall (re-)start. - diff --git a/files/etc/config.router/network b/files/etc/config.router/network deleted file mode 100644 index d5d3933d..00000000 --- a/files/etc/config.router/network +++ /dev/null @@ -1,28 +0,0 @@ -#### Loopback configuration -config interface loopback - option ifname "lo" - option proto static - option ipaddr 127.0.0.1 - option netmask 255.0.0.0 - - -#### LAN configuration -config interface lan - option type bridge - option ifname "" - option proto - option ipaddr - option netmask - option dns " " - option gateway - - -#### WAN configuration -config interface wan - option ifname "" - option proto - option ipaddr - option netmask - option gateway - -include /etc/aredn_include/swconfig diff --git a/files/etc/config.router/system b/files/etc/config.router/system deleted file mode 100644 index 17090087..00000000 --- a/files/etc/config.router/system +++ /dev/null @@ -1,24 +0,0 @@ -config 'system' - option 'hostname' '' - option 'timezone' '' - -config 'timeserver' 'ntp' - list 'server' '' - option enable_server 0 - option enabled 0 - -config button - option button 'reset' - option action 'released' - option handler '/usr/local/bin/bbhnrecoverymode' - option min '3' - option max '7' - -config button - option button 'reset' - option action 'released' - option handler 'firstboot -y && reboot' - option min '12' - option max '20' - -include /etc/aredn_include/system_netled diff --git a/files/etc/config.router/uhttpd b/files/etc/config.router/uhttpd deleted file mode 100644 index 7e65aafb..00000000 --- a/files/etc/config.router/uhttpd +++ /dev/null @@ -1,13 +0,0 @@ -# Server configuration -config uhttpd main - - # HTTP listen addresses, multiple allowed - list listen_http 0.0.0.0:8080 - list listen_http 0.0.0.0:80 - option home /www - option rfc1918_filter 1 - option cgi_prefix /cgi-bin - option script_timeout 240 - option network_timeout 30 - option tcp_keepalive 5 -# option config /etc/httpd.conf diff --git a/files/etc/config.router/wireless b/files/etc/config.router/wireless deleted file mode 100644 index 470a9072..00000000 --- a/files/etc/config.router/wireless +++ /dev/null @@ -1,14 +0,0 @@ -config wifi-device radio0 - option type mac80211 - option channel - option chanbw - option disabled 1 -include /etc/aredn_include/radio0path - -config wifi-iface - option device radio0 - option network lan - option mode - option ssid "" - option encryption none - diff --git a/files/lib/upgrade/keep.d/bbhn-base b/files/lib/upgrade/keep.d/bbhn-base index 4bcdce00..ae4f8438 100644 --- a/files/lib/upgrade/keep.d/bbhn-base +++ b/files/lib/upgrade/keep.d/bbhn-base @@ -1,9 +1,3 @@ -/etc/config.ap/_setup -/etc/config.ap/_setup.dhcp -/etc/config.ap/_setup.ports -/etc/config.client/_setup -/etc/config.client/_setup.dhcp -/etc/config.client/_setup.ports /etc/config.mesh/_setup /etc/config.mesh/_setup.dhcp.dmz /etc/config.mesh/_setup.dhcp.nat @@ -11,12 +5,6 @@ /etc/config.mesh/_setup.ports.nat /etc/config.mesh/_setup.services.dmz /etc/config.mesh/_setup.services.nat -/etc/config.mesh_ap/_setup -/etc/config.mesh_ap/_setup.dhcp -/etc/config.mesh_ap/_setup.ports -/etc/config.router/_setup -/etc/config.router/_setup.dhcp -/etc/config.router/_setup.ports /etc/httpd.conf /etc/local/services /etc/local/uci/hsmmmesh diff --git a/files/www/cgi-bin/supporttool b/files/www/cgi-bin/supporttool index 3cb7c1a8..ee05f692 100755 --- a/files/www/cgi-bin/supporttool +++ b/files/www/cgi-bin/supporttool @@ -41,11 +41,7 @@ $phy=get_wlan2phy("${wifiif}"); @files = ( "/etc/config/", - "/etc/config.ap/", - "/etc/config.client/", "/etc/config.mesh/", - "/etc/config.mesh_ap/", - "/etc/config.router/", "/etc/local/", "/etc/mesh-release", "/tmp/etc/",