Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not force nameserver 127.0.0.1 through resolvconf #3031

Merged
merged 2 commits into from Dec 11, 2019
Merged

Do not force nameserver 127.0.0.1 through resolvconf #3031

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
620e1e9
Do not force nameserver 127.0.0.1 through resolvconf in pihole-FTL.se…
DL6ER Dec 9, 2019
ec09b58
Merge branch 'development' into fix/do_not_force_local_resolver
PromoFaux Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions advanced/Templates/pihole-FTL.service
View file
Open in desktop
Expand Up @@ -50,7 +50,6 @@ start() {
chmod 0644 /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log
# Chown database files to the user FTL runs as. We ignore errors as the files may not (yet) exist
chown pihole:pihole /etc/pihole/pihole-FTL.db /etc/pihole/gravity.db 2> /dev/null
echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.piholeFTL
if setcap CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN+eip "$(which pihole-FTL)"; then
su -s /bin/sh -c "/usr/bin/pihole-FTL" "$FTLUSER"
else
Expand All @@ -64,7 +63,6 @@ start() {
# Stop the service
stop() {
if is_running; then
/sbin/resolvconf -d lo.piholeFTL
kill "$(get_pid)"
for i in {1..5}; do
if ! is_running; then
Expand Down