From c338eab3c634e2e3218d4eee3a4d084b2c8f8af3 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 28 Sep 2018 11:11:30 +0200 Subject: [PATCH 1/2] According to the PHP documentation, PHP 7.0.0+ does not longer recognize hash marks (#) as comments. As FTL has been trained to understand PHP-style (comment lines start with ";") as well, we switch to using them. Signed-off-by: DL6ER --- advanced/Templates/pihole-FTL.conf | 140 ++++++++++++++--------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/advanced/Templates/pihole-FTL.conf b/advanced/Templates/pihole-FTL.conf index 03f42932..03f68c79 100644 --- a/advanced/Templates/pihole-FTL.conf +++ b/advanced/Templates/pihole-FTL.conf @@ -1,84 +1,84 @@ -### This file contains parameters for FTL behavior. -### At install, all parameters are commented out. The user can select desired options. -### Options shown are the default configuration. No modification is needed for most -### installations. -### Visit https://docs.pi-hole.net/ftldns/configfile/ for more detailed parameter explanations +;;; This file contains parameters for FTL behavior. +;;; At install, all parameters are commented out. The user can select desired options. +;;; Options shown are the default configuration. No modification is needed for most +;;; installations. +;;; Visit https://docs.pi-hole.net/ftldns/configfile/ for more detailed parameter explanations -## Socket Listening -## Listen only for local socket connections or permit all connections -## Options: localonly, all -#SOCKET_LISTENING=localonly +;; Socket Listening +;; Listen only for local socket connections or permit all connections +;; Options: localonly, all +;SOCKET_LISTENING=localonly -## Query Display -## Display all queries? Set to no to hide query display -## Options: yes, no -#QUERY_DISPLAY=yes +;; Query Display +;; Display all queries? Set to no to hide query display +;; Options: yes, no +;QUERY_DISPLAY=yes -## AAA Query Analysis -## Allow FTL to analyze AAAA queries from pihole.log? -## Options: yes, no -#AAAA_QUERY_ANALYSIS=yes +;; AAA Query Analysis +;; Allow FTL to analyze AAAA queries from pihole.log? +;; Options: yes, no +;AAAA_QUERY_ANALYSIS=yes -## Resolve IPv6 -## Should FTL try to resolve IPv6 addresses to host names? -## Options: yes, no -#RESOLVE_IPV6=yes +;; Resolve IPv6 +;; Should FTL try to resolve IPv6 addresses to host names? +;; Options: yes, no +;RESOLVE_IPV6=yes -## Resolve IPv4 -## Should FTL try to resolve IPv4 addresses to host names? -## Options: yes, no -#RESOLVE_IPV4=yes +;; Resolve IPv4 +;; Should FTL try to resolve IPv4 addresses to host names? +;; Options: yes, no +;RESOLVE_IPV4=yes -## Max Database Days -## How long should queries be stored in the database (days)? -## Setting this to 0 disables the database -## See: https://docs.pi-hole.net/ftldns/database/ -## Options: number of days -#MAXDBDAYS=365 +;; Max Database Days +;; How long should queries be stored in the database (days)? +;; Setting this to 0 disables the database +;; See: https://docs.pi-hole.net/ftldns/database/ +;; Options: number of days +;MAXDBDAYS=365 -## Database Interval -## How often do we store queries in FTL's database (minutes)? -## See: https://docs.pi-hole.net/ftldns/database/ -## Options: number of minutes -#DBINTERVAL=1.0 +;; Database Interval +;; How often do we store queries in FTL's database (minutes)? +;; See: https://docs.pi-hole.net/ftldns/database/ +;; Options: number of minutes +;DBINTERVAL=1.0 -## Database File -## Specify path and filename of FTL's SQLite3 long-term database. -## Setting this to DBFILE= disables the database altogether -## See: https://docs.pi-hole.net/ftldns/database/ -## Option: path to db file -#DBFILE=/etc/pihole/pihole-FTL.db +;; Database File +;; Specify path and filename of FTL's SQLite3 long-term database. +;; Setting this to DBFILE= disables the database altogether +;; See: https://docs.pi-hole.net/ftldns/database/ +;; Option: path to db file +;DBFILE=/etc/pihole/pihole-FTL.db -## Max Log Age -## Up to how many hours of queries should be imported from the database and logs (hours)? -## Maximum is 744 (31 days) -## Options: number of days -#MAXLOGAGE=24.0 +;; Max Log Age +;; Up to how many hours of queries should be imported from the database and logs (hours)? +;; Maximum is 744 (31 days) +;; Options: number of days +;MAXLOGAGE=24.0 -## FTL Port -## On which port should FTL be listening? -## Options: tcp port -#FTLPORT=4711 +;; FTL Port +;; On which port should FTL be listening? +;; Options: tcp port +;FTLPORT=4711 -## Privacy Level -## Which privacy level is used? -## See: https://docs.pi-hole.net/ftldns/privacylevels/ -## Options: 0, 1, 2, 3 -#PRIVACYLEVEL=0 +;; Privacy Level +;; Which privacy level is used? +;; See: https://docs.pi-hole.net/ftldns/privacylevels/ +;; Options: 0, 1, 2, 3 +;PRIVACYLEVEL=0 -## Ignore Localhost -## Should FTL ignore queries coming from the local machine? -## Options: yes, no -#IGNORE_LOCALHOST=no +;; Ignore Localhost +;; Should FTL ignore queries coming from the local machine? +;; Options: yes, no +;IGNORE_LOCALHOST=no -## Blocking Mode -## How should FTL reply to blocked queries? -## See: https://docs.pi-hole.net/ftldns/blockingmode/ -## Options: NULL, IP-AAAA-NODATA, IP, NXDOMAIN -#BLOCKINGMODE=NULL +;; Blocking Mode +;; How should FTL reply to blocked queries? +;; See: https://docs.pi-hole.net/ftldns/blockingmode/ +;; Options: NULL, IP-AAAA-NODATA, IP, NXDOMAIN +;BLOCKINGMODE=NULL -## Regex Debug Mode -## Controls if FTLDNS should print extended details about regex matching into pihole-FTL.log. -## See: https://docs.pi-hole.net/ftldns/regex/overview/ -## Options: true, false -#REGEX_DEBUGMODE=false +;; Regex Debug Mode +;; Controls if FTLDNS should print extended details about regex matching into pihole-FTL.log. +;; See: https://docs.pi-hole.net/ftldns/regex/overview/ +;; Options: true, false +;REGEX_DEBUGMODE=false From b043000044424bf8a5676839ebf7944fa194434f Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 28 Sep 2018 12:08:39 +0200 Subject: [PATCH 2/2] Improve template by removing it. PHP cannot digest comments starting in "#" as of v7.0.0 Signed-off-by: DL6ER --- advanced/Templates/pihole-FTL.conf | 84 ------------------------------ 1 file changed, 84 deletions(-) delete mode 100644 advanced/Templates/pihole-FTL.conf diff --git a/advanced/Templates/pihole-FTL.conf b/advanced/Templates/pihole-FTL.conf deleted file mode 100644 index 03f68c79..00000000 --- a/advanced/Templates/pihole-FTL.conf +++ /dev/null @@ -1,84 +0,0 @@ -;;; This file contains parameters for FTL behavior. -;;; At install, all parameters are commented out. The user can select desired options. -;;; Options shown are the default configuration. No modification is needed for most -;;; installations. -;;; Visit https://docs.pi-hole.net/ftldns/configfile/ for more detailed parameter explanations - -;; Socket Listening -;; Listen only for local socket connections or permit all connections -;; Options: localonly, all -;SOCKET_LISTENING=localonly - -;; Query Display -;; Display all queries? Set to no to hide query display -;; Options: yes, no -;QUERY_DISPLAY=yes - -;; AAA Query Analysis -;; Allow FTL to analyze AAAA queries from pihole.log? -;; Options: yes, no -;AAAA_QUERY_ANALYSIS=yes - -;; Resolve IPv6 -;; Should FTL try to resolve IPv6 addresses to host names? -;; Options: yes, no -;RESOLVE_IPV6=yes - -;; Resolve IPv4 -;; Should FTL try to resolve IPv4 addresses to host names? -;; Options: yes, no -;RESOLVE_IPV4=yes - -;; Max Database Days -;; How long should queries be stored in the database (days)? -;; Setting this to 0 disables the database -;; See: https://docs.pi-hole.net/ftldns/database/ -;; Options: number of days -;MAXDBDAYS=365 - -;; Database Interval -;; How often do we store queries in FTL's database (minutes)? -;; See: https://docs.pi-hole.net/ftldns/database/ -;; Options: number of minutes -;DBINTERVAL=1.0 - -;; Database File -;; Specify path and filename of FTL's SQLite3 long-term database. -;; Setting this to DBFILE= disables the database altogether -;; See: https://docs.pi-hole.net/ftldns/database/ -;; Option: path to db file -;DBFILE=/etc/pihole/pihole-FTL.db - -;; Max Log Age -;; Up to how many hours of queries should be imported from the database and logs (hours)? -;; Maximum is 744 (31 days) -;; Options: number of days -;MAXLOGAGE=24.0 - -;; FTL Port -;; On which port should FTL be listening? -;; Options: tcp port -;FTLPORT=4711 - -;; Privacy Level -;; Which privacy level is used? -;; See: https://docs.pi-hole.net/ftldns/privacylevels/ -;; Options: 0, 1, 2, 3 -;PRIVACYLEVEL=0 - -;; Ignore Localhost -;; Should FTL ignore queries coming from the local machine? -;; Options: yes, no -;IGNORE_LOCALHOST=no - -;; Blocking Mode -;; How should FTL reply to blocked queries? -;; See: https://docs.pi-hole.net/ftldns/blockingmode/ -;; Options: NULL, IP-AAAA-NODATA, IP, NXDOMAIN -;BLOCKINGMODE=NULL - -;; Regex Debug Mode -;; Controls if FTLDNS should print extended details about regex matching into pihole-FTL.log. -;; See: https://docs.pi-hole.net/ftldns/regex/overview/ -;; Options: true, false -;REGEX_DEBUGMODE=false