From b6b50288bb5ca12e025706cd3bec3658e39d192d Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 17 Nov 2020 11:19:17 +0000 Subject: [PATCH] Deprecate 090_raspap.conf, default to 090_wlan0 --- installers/common.sh | 2 +- installers/raspap.sudoers | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index 4d4a03e9..960b42d2 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -18,7 +18,7 @@ set -o errtrace readonly raspap_dir="/etc/raspap" readonly raspap_user="www-data" readonly raspap_sudoers="/etc/sudoers.d/090_raspap" -readonly raspap_dnsmasq="/etc/dnsmasq.d/090_raspap.conf" +readonly raspap_dnsmasq="/etc/dnsmasq.d/090_wlan0.conf" readonly raspap_adblock="/etc/dnsmasq.d/090_adblock.conf" readonly raspap_sysctl="/etc/sysctl.d/90_raspap.conf" readonly rulesv4="/etc/iptables/rules.v4" diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers index 69262f1a..00e1d1c7 100644 --- a/installers/raspap.sudoers +++ b/installers/raspap.sudoers @@ -20,7 +20,6 @@ www-data ALL=(ALL) NOPASSWD:/bin/systemctl stop openvpn-client@client www-data ALL=(ALL) NOPASSWD:/bin/systemctl disable openvpn-client@client www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/ovpnclient.ovpn /etc/openvpn/client/client.conf www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/authdata /etc/openvpn/client/login.conf -www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_raspap.conf www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_*.conf www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/dnsmasq.d/090_*.conf www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dhcpcd.conf