From 687c16810e23c08daf53a32bf032155a9f5dd6fe Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 20 Nov 2020 13:35:52 +0000 Subject: [PATCH 1/2] Update default dhcpcd config --- config/dhcpcd.conf | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/config/dhcpcd.conf b/config/dhcpcd.conf index 22a4ae18..13fb76fd 100644 --- a/config/dhcpcd.conf +++ b/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 From 73deab78cfb4cab8ff7c93bfa1a0885f8682aba7 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 20 Nov 2020 22:06:51 +0000 Subject: [PATCH 2/2] Update uninstall: remove adblock (optional) --- installers/uninstall.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/installers/uninstall.sh b/installers/uninstall.sh index bc2aa4a8..77afda6c 100755 --- a/installers/uninstall.sh +++ b/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