Merge pull request #2626 from pi-hole/hotfix/v4.2.2

Pi-hole Core v4.2.2
Delete /dev/shm/FTL-* files on (re)start of pihole-FTL
2019-02-18 18:36:13 +01:00 · 2019-02-08 15:00:35 +01:00 · 2019-02-03 11:36:57 -08:00 · 2019-02-03 10:55:18 -08:00
2 changed files with 2 additions and 3 deletions
--- a/advanced/01-pihole.conf
+++ b/advanced/01-pihole.conf
@@ -22,9 +22,6 @@ addn-hosts=/etc/pihole/gravity.list
 addn-hosts=/etc/pihole/black.list
 addn-hosts=/etc/pihole/local.list

-user=pihole
-group=pihole
-
 domain-needed

 localise-queries
--- a/advanced/Templates/pihole-FTL.service
+++ b/advanced/Templates/pihole-FTL.service
@@ -33,6 +33,8 @@ start() {
    mkdir -p /var/run/pihole
    mkdir -p /var/log/pihole
    chown pihole:pihole /var/run/pihole /var/log/pihole
+    # Remove possible leftovers from previous pihole-FTL processes
+    rm -f /dev/shm/FTL-* 2> /dev/null
    rm /var/run/pihole/FTL.sock 2> /dev/null
    # Ensure that permissions are set so that pihole-FTL can edit all necessary files
    chown pihole:pihole /run/pihole-FTL.pid /run/pihole-FTL.port
Author	SHA1	Message	Date
DL6ER	ba1e94d3d9	Merge pull request #2626 from pi-hole/hotfix/v4.2.2 Pi-hole Core v4.2.2	2019-02-18 18:36:13 +01:00
DL6ER	5ca1bfc11c	Delete /dev/shm/FTL-* files on (re)start of pihole-FTL Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-08 15:00:35 +01:00
Dan Schaper	e967fe2266	Merge pull request #2612 from pi-hole/hotfix/v4.2.1 Remove user/group from dnsmasq config	2019-02-03 11:36:57 -08:00
Mcat12	7a19d24058	Remove user/group from dnsmasq config In the case that FTL is started under root, dnsmasq changes the user to pihole due to this setting. The shared memory is created before this switch, and may cause issues such as failing to delete or reallocate the shared memory. These config lines were necessary before dnsmasq became part of FTL, but now since dnsmasq runs under FTL, we can configure the user/group through FTL. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-02-03 10:55:18 -08:00