Merge branch 'feature/dhcp-eth0' of https://github.com/billz/raspap-webgui into feature/dhcp-eth0

config/dhcpcd.conf

@@ -1,4 +1,4 @@
-# Defaults from Raspberry Pi configuration
+# RaspAP wlan0 configuration
 hostname
 clientid
 persistent
@@ -9,19 +9,8 @@ option ntp_servers
 require dhcp_server_identifier
 slaac private
 nohook lookup-hostname
-
-#denyinterfaces eth0 wlan0 #BRIDGED
-
-# RaspAP br0 configuration
-interface br0
-
-# RaspAP wlan0 configuration
 interface wlan0
 static ip_address=10.3.141.1/24
 static routers=10.3.141.1
 static domain_name_server=9.9.9.9 1.1.1.1
 
-# RaspAP uap0 configuration
-interface uap0
-static ip_address=192.168.50.1/24
-nohook wpa_supplicant

installers/uninstall.sh

@@ -20,6 +20,7 @@ readonly raspap_user="www-data"
 readonly raspap_sudoers="/etc/sudoers.d/090_raspap"
 readonly raspap_dnsmasq="/etc/dnsmasq.d/090_wlan0.conf"
 readonly raspap_sysctl="/etc/sysctl.d/90_raspap.conf"
+readonly raspap_adblock="/etc/dnsmasq.d/090_adblock.conf"
 readonly raspap_network="/etc/systemd/network/"
 readonly rulesv4="/etc/iptables/rules.v4"
 webroot_dir="/var/www/html"
@@ -175,6 +176,10 @@ function _restore_networking() {
     sudo rm "$raspap_dnsmasq" || _install_error "Unable to remove $raspap_dnsmasq"
     echo "Removing raspap bridge configurations"
     sudo rm "$raspap_network"/raspap* || _install_error "Unable to remove bridge config"
+    if [ -f $raspap_adblock ]; then
+        echo "Removing raspap adblock configuration"
+        sudo rm "$raspap_adblock" || _install_error "Unable to remove adblock config"
+    fi
 }
 
 # Removes installed packages