From: tcely Date: Mon, 5 Nov 2018 16:54:34 +0000 (-0500) Subject: Pre-resolve file conflict X-Git-Tag: dnsdist-1.4.0-rc3~42^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8396e42987faa47b139276dbbe315d0d82694a06;p=thirdparty%2Fpdns.git Pre-resolve file conflict --- diff --git a/build-scripts/debian-authoritative/config/pdns.local.lua.conf b/build-scripts/debian-authoritative/config/pdns.local.lua.conf index e2edf4b8b1..529fe51953 100644 --- a/build-scripts/debian-authoritative/config/pdns.local.lua.conf +++ b/build-scripts/debian-authoritative/config/pdns.local.lua.conf @@ -1,6 +1,6 @@ # Configuration for the lua backend #lua-filename = powerdns-luabackend.lua -#lua-query-logging = no +#lua-logging-query = no # You can also override all the default functionsnames for the luafunctions if you # want. The prefix is lua-f_=mynewfunction. For example: