From c56a48234f4f3240b97871882130c0ebca76b88c Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 20 Mar 2020 17:43:46 +0000 Subject: [PATCH] Update dnsmasq.d path --- config/config.php | 2 +- includes/defaults.php | 2 +- installers/raspap.sudoers | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.php b/config/config.php index 29be0f94..bee93a02 100755 --- a/config/config.php +++ b/config/config.php @@ -9,7 +9,7 @@ define('RASPI_CACHE_PATH', sys_get_temp_dir() . '/raspap'); // Constants for configuration file paths. // These are typical for default RPi installs. Modify if needed. -define('RASPI_DNSMASQ_CONFIG', '/etc/dnsmasq.conf'); +define('RASPI_DNSMASQ_CONFIG', '/etc/dnsmasq.d/090_raspap.conf'); define('RASPI_DNSMASQ_LEASES', '/var/lib/misc/dnsmasq.leases'); define('RASPI_HOSTAPD_CONFIG', '/etc/hostapd/hostapd.conf'); define('RASPI_DHCPCD_CONFIG', '/etc/dhcpcd.conf'); diff --git a/includes/defaults.php b/includes/defaults.php index 4efbe056..ac85d562 100755 --- a/includes/defaults.php +++ b/includes/defaults.php @@ -13,7 +13,7 @@ $defaults = [ // Constants for configuration file paths. // These are typical for default RPi installs. Modify if needed. - 'RASPI_DNSMASQ_CONFIG' => '/etc/dnsmasq.conf', + 'RASPI_DNSMASQ_CONFIG' => '/etc/dnsmasq.d/090_raspap.conf', 'RASPI_DNSMASQ_LEASES' => '/var/lib/misc/dnsmasq.leases', 'RASPI_HOSTAPD_CONFIG' => '/etc/hostapd/hostapd.conf', 'RASPI_DHCPCD_CONFIG' => '/etc/dhcpcd.conf', diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers index 60b2e136..ee201fcb 100644 --- a/installers/raspap.sudoers +++ b/installers/raspap.sudoers @@ -19,7 +19,7 @@ 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.conf +www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_raspap.conf www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dhcpcd.conf www-data ALL=(ALL) NOPASSWD:/sbin/shutdown -h now www-data ALL=(ALL) NOPASSWD:/sbin/reboot