arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-18 22:28:18 +00:00
Code Issues Releases Wiki Activity
5,308 Commits 8 Branches 109 Tags 19 MiB
d77677312c
Commit Graph

355 Commits

Author SHA1 Message Date
Christian König
d2c75a33d5 Increase width of ID column in adlist and domain table in debug script 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-08-04 20:13:41 +02:00
Christian König
aa2da80768 Remove traces of unused files 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-07-28 23:06:01 +02:00
Christian König
b05fc5bb2b Remove specific dnsmasq config files from requiered files 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-07-28 23:01:18 +02:00
Christian König
c99c86af7f Make all dir list output human readable 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-07-28 22:53:30 +02:00
Christian König
f552173be3 Resolve merge conflict 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-07-28 22:51:04 +02:00
DL6ER
d02aa3ced1
Fix error on checking interfaces that are not dual-stack 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-28 22:34:55 +02:00
DL6ER
fbfec961d5
Remove comparison of IP addresses with setupVars.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-28 21:16:19 +02:00
Christian König
0c125eba2c Make output of SHM dir human readable 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-07-27 22:04:30 +02:00
Daniel
fdca19e66d Support and test Debian Bullsye (11) 
Signed-off-by: Daniel <daniel@developerdan.com>
 2021-07-07 19:09:54 +00:00
Adam Warner
0cbf77eb9f
Merge pull request #4131 from pi-hole/fix/gravity_no_locallist 
Handle pi.hole and hostname in FTL instead of local.list
 2021-07-04 11:52:30 +01:00
Adam Warner
e80e54a61a
head_line -> line 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-04 01:18:46 +01:00
Christian König
08cf9aa5a7 Declare and assign 'logging_enabled' separately 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-06-19 12:25:38 +02:00
Christian König
1ae67e1de8 Only inform user about disabled logging, don't skipp printing pihole.log 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-06-19 12:25:38 +02:00
Christian König
f2cba6cad1 Skip analyze_pihole_log if query logging has been disabled 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-06-19 12:25:38 +02:00
Christian König
df3c46349a Add tail of pihole.log to debug output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-06-19 12:25:38 +02:00
DL6ER
3b574096b8
Remove duplicated lo test 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-16 12:28:00 +02:00
DL6ER
58905a1188
Modify debugger to test name resolution on all available interfaces 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-16 12:14:05 +02:00
Alexander Schmitz
1ab193fa9d
Update piholeDebug.sh 
Signed-off-by: Alexander Schmitz <Flashbang007@gmail.com>
 2021-01-27 11:00:43 +01:00
freddii
7c0c30fb0b fixed typos 2021-01-19 19:33:38 +01:00
DL6ER
78cdd34992
Merge pull request #3904 from ganto/fix/debug-non-web-2 
piholeDebug: Diagnose output if (Web) git directory is not found
 2020-12-10 23:00:45 +01:00
Reto Gantenbein
9dc539c98b piholeDebug: More detailed diagnostics if Web interface is not found 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 18:46:11 +01:00
Reto Gantenbein
18e4eb460c piholeDebug: Fix version check if lighttpd/php are not installed 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 14:11:53 +01:00
Adam Warner
8443262214
Merge pull request #3890 from ganto/fix/x86-64-arch 
Ensure x86_64 processor architecture is listed as supported
 2020-12-02 21:12:18 +00:00
DL6ER
36937b1913
Strip such lines starting with a #. Do not silently truncate lines if they have a # somewhere in between (like server=127.0.0.1#5353) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-02 20:52:39 +01:00
Reto Gantenbein
d0af1a950b Ensure x86_64 processor architecture is listed as supported 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-02 20:44:11 +01:00
Adam Warner
d2e9a20d96
Merge pull request #3859 from yubiuser/tweak/debug_pihole-FTL_status 
Add systemctl status --full --no-pager pihole-FTL.service to the debug log
 2020-11-28 16:58:23 +00:00
DL6ER
d4c33e5188
Include the raw messages from the Pi-hole diagnosis systems in debug logs 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-24 16:06:45 +01:00
Christian König
70c48afc04 Add else statement 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-24 06:02:18 +01:00
Christian König
ec5183b553 Rename function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-24 05:57:13 +01:00
Christian König
50316ee617 Add systemctl status --full --no-pager pihole-FTL.service to the debug log 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-23 21:09:35 +01:00
bcambl
47aa1644a8 add debug checking for firewalld 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-11 22:20:31 -06:00
Adam Warner
fe463f15b3
Merge pull request #3741 from pi-hole/new/debug_scan_dhcp 
Discover active DHCP servers during debugger run
 2020-10-09 14:00:57 +01:00
Christian König
568ebd67ca Update comment 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-10-03 16:17:37 +02:00
Christian König
c628c970ae Print tail of logs in /var/log/lighttpd in debug run as well 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-10-02 21:04:27 +02:00
DL6ER
41e899260f
Discover active DHCP servers during debugger run 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-09-07 23:17:50 +02:00
Adam Warner
b8cd238fa1
Update advanced/Scripts/piholeDebug.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-08-23 14:35:02 +01:00
Adam Warner
8e219cb799
Make output more meaningful in case of dig failure. 
Include dig return code and response in debug run

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-08-23 10:48:15 +01:00
Dan Schaper
ebdb68a47a
display_warning fixes 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-08-15 10:54:31 -07:00
Dan Schaper
623ce1fe18
Tabs and debug.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-08-14 14:37:58 -07:00
Aiden Mitchell
7c53b97004
Updating FAQ_HARDWARE_REQUIREMENTS and FAQ_HARDWARE_REQUIREMENTS_PORTS (#3632) 
Signed-off-by: Aiden Mitchell <aiden@bcyouthcouncil.ca>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-30 12:57:19 -07:00
Adam Warner
f50cff54de
*innocent whistling* 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 23:49:17 +01:00
Adam Warner
849139176e
fallback to NC if curl fails on uploadgit checkout 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 21:54:45 +01:00
Adam Warner
b8bba7951f
Just one more newline, give it to me. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 20:49:18 +01:00
Adam Warner
76ce5ec66b
Add additional information about local debug log location 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 20:45:02 +01:00
XhmikosR
d8822b70cf Fix minor typo 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-07-05 15:12:02 +03:00
Adam Warner
7ea6d7b92b
remove ; so IFS changes don't stick 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-14 00:17:51 +01:00
Adam Warner
03a8cff55e
read > mapfile as suggested by @dschaper 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-05 21:01:53 +01:00
Adam Warner
58724a38a9
Improve detection and display of supported/unsupported OS in debug script 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-03 17:57:22 +01:00
Adam Warner
d0e250a616
Ensure pihole-FTL.conf is parsed, as well as external.conf for lighttpd, to rule out any custom modifications. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-21 22:25:00 +01:00
Adam Warner
b2ba55c27b
Show details of any remotes on the git repositories 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-21 21:23:26 +01:00
Adam Warner
9e96ff37de
Fix merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 22:16:43 +01:00
DL6ER
ddb354f78b
Add enable indentation for the domainlist 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-29 06:23:29 +02:00
DL6ER
20ef5e0264
Show associated group IDs in domains/clients/adlists listing. We get the data through a LEFT JOIN followed by a GROUPing by the left list ID and finialized through a GROUP_CONCATenation. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-24 10:33:46 +02:00
DL6ER
ad5802715e
enabled field: Center 0, right-align 1 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 15:16:48 +02:00
DL6ER
63f6c6a894
Add indentation for enabled and type fields 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 10:01:22 +02:00
XhmikosR
7b8611ced0
Assorted typo fixes. (#3126) 
* Assorted typo fixes.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-08 16:53:14 -07:00
DL6ER
497bfd80a5
Update development from release/v5.0 (#3200) 
* Use bash regex instead of awk.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

* Fix incorrect type description. (#3201)

Signed-off-by: DL6ER <dl6er@dl6er.de>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-08 16:38:53 -07:00
DL6ER
22ce5c0d70
Fix incorrect type description. (#3201) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-03-08 16:32:37 -07:00
Adam Warner
8ecaaba247
Compare daemons to expected results. (#3158) (#3159) 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Co-authored-by: Dan Schaper <dan@glacialmagma.com>
 2020-02-24 18:00:19 +00:00
Dan Schaper
c5c414a7a2
Stickler Lint - quote to prevent splitting 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-02-16 19:24:05 -08:00
DL6ER
d0e29ab7b0 Add human-readable output of time of the last gravity run. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 17:43:54 -08:00
DL6ER
714a79ffce Migrate debugger to domainlist and add printing of client table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 17:43:54 -08:00
DL6ER
cd3ad0bdc7 Show info table instead of counting domains to speed up the debugging process on low-end hardware drastically. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 17:43:54 -08:00
DL6ER
3f9e79f152
Print human-readable timestamps in the debugger's gravity output 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-20 20:13:44 +01:00
DL6ER
6faddfcd3d
Print timestamps in local time zone of the Pi-hole. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-23 10:09:52 +02:00
DL6ER
1820c2c598
Merge branch 'development' into new/whitelist-regex-support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 14:19:51 +02:00
DL6ER
b1838512b2
Explicitly select columns (and their order) when listing the databaes tables. Print timestamps translated to strings instead of printing the integer timestamps. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 13:39:58 +02:00
DL6ER
3e78ed95d4
Fix displaying options for table "group" in the debugger. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-17 15:04:04 +02:00
DL6ER
dc93462d42
Group table has only two columns 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-06 20:28:00 +02:00
DL6ER
af754e3fc4
Rearrange group tables directly next to the tables they refer to. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:08:36 +02:00
DL6ER
06860ed5b4
Group tables have only two columns. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:07:39 +02:00
DL6ER
0d28dce326
Print group table contents in debug log. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 20:18:15 +02:00
DL6ER
87f75c737a
Review comments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:00:38 +02:00
Mcat12
b154dd5f07
Quote calls to read FTL config 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-08 19:48:50 -07:00
DL6ER
054c7a2c05
Create new table + view regex_whitelist + rename old regex table to regex_blacklist. This updates the gravity.db version to 3. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 21:35:31 +02:00
Mcat12
e8e5d4afda
Get file locations of FTL files from the config 
Instead of hardcoding the location of certain FTL files (`gravity.db`,
`pihole-FTL.log`), read the configured location from FTL's config. The
default location is used if no custom location has been configured.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-07 18:10:39 -07:00
DL6ER
1fe3507bc5
Adlists table was renamed to Adlist. Adapt further places in the code to match the new name. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-03 07:56:10 +02:00
Mcat12
bfb99c361c
Note that the gravity size does not include the blacklist entries 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-21 17:12:47 -07:00
Mcat12
5796054305
Increase ID column width to 4 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:59:18 -07:00
Mcat12
a3e1473ac1
Set explicit column widths to prevent text from getting cut off 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:33:09 -07:00
Mcat12
7b5fc60e00
Improve table formatting 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:20:38 -07:00
Mcat12
807ce0af4e
Show whitelist, blacklist, and regexlist details 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:15:22 -07:00
Mcat12
3f05efd60f
Add extra newline 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:02:31 -07:00
Mcat12
03d93aa19a
Update debug script with gravity DB changes 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 20:58:57 -07:00
Dan Schaper
5532df24e4
Pi-hole Debug - tricorder upload function calls 
Fix tricorder upload function calls to use new curl function.
 2019-05-03 02:46:27 -07:00
Dan Schaper
71cd6c137b Use curl instead of openssl for transmission of unmodified 
log file. We want ansi color codes to be sent.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2019-02-23 04:13:44 -08:00
Adam Warner
a145f1d931
Be more verbose with debug script output 
If output of `git status -s` is non-null display changes
if output of `git diff` is non-null, display diff

Signed-off-by: Adam Warner <adamw@rner.email>
 2019-02-18 22:32:53 +00:00
Mcat12
26f2410fe6
Change /var/run/shm to /dev/shm 
The /var directory may not exist (does not exist on Fedora 29), and is
simply a symlink to /dev/shm.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-02-02 10:37:12 -08:00
DL6ER
5ffc8c7443
List content of /var/run/shm in debugger 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-01 17:56:02 +01:00
Mcat12
9d59da8974
Remove dnsmasq checks from debugger 
This also fixes an issue where the port checks weren't running
(`compare_port_to_service_assigned`).

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-11-08 21:51:21 -05:00
Mark Drobnak
bbb759c684
Merge pull request #2477 from bcambl/debug_init_service_check 
fix debug service check via sysvinit
 2018-11-07 17:50:32 -05:00
Adam Warner
d57f9906bd
read -r -a, not read -a -r 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-10-26 19:24:43 +01:00
bcambl
3ec84553ef fix debug service check via sysvinit 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-10-24 10:06:11 -06:00
mrmajik45
0f509f4a34
Update piholeDebug.sh 2018-09-28 17:22:31 -04:00
mrmajik45
00f98543ad
read without -r will mangle backslashes. 2018-09-26 10:32:22 -04:00
Mcat12
03e5a78d8f
Merge remote-tracking branch 'origin/FTLDNS' into development 
# Conflicts:
#	advanced/Scripts/piholeDebug.sh
 2018-07-22 15:18:26 -04:00
Dan Schaper
ba7782f867
Space/Tab piholeDebug.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 15:25:35 -07:00
Mcat12
868948509a
Split declaration and assignment of random_url 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-20 20:30:42 -04:00
Mark Drobnak
e71492a2b3
Update debug script for simple list format 
Gravity is now just a list of domains, not IP addresses and domains separated by a space.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-20 20:29:32 -04:00
Mark Drobnak
9fd70cbdf9
Merge pull request #2057 from pi-hole/fix/debug-empty-ports 
debug script: fix empty ports on some systems
 2018-05-30 21:48:53 -04:00