DL6ER
c1495b0fa8
Merge branch 'development' into new/arp-flush
5 years ago
Mark Drobnak
67dda9c8bb
Merge pull request #2790 from mmotti/tidy/query
...
Small changes to regexp querying
5 years ago
MMotti
bcf03647ef
Add comment and remove blankspace
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
MMotti
a9d0690f4d
Change the case of some variables
...
Just for consistency
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
MMotti
10fbed50f3
Shellcheck
...
Suggesting to use parameter expansion but we need to be able to identify the start of each line
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
MMotti
785f1fedd9
Tidy regexp queries
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
Mark Drobnak
b0c5dcf42f
Merge pull request #2780 from mmotti/fix/regexp_query
...
Fix for regexp queries through pihole -q
5 years ago
MMotti
cf21efa103
Minor grammar changes
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
MMotti
7613e94ef6
Minor tweaks
...
Mainly for consistency
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
MMotti
b49c702f33
Consistency tweak
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
MMotti
09532638d5
Read from DB instead of regex.list
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
MMotti
97df6d7415
Stickler fix
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
MMotti
54bfaa28c1
Fix for regexp queries through pihole -q
...
Taking inspiration from: https://github.com/pi-hole/pi-hole/pull/2346
We will use awk to iterate through each regexp and print any that match the domain query.
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
Mark Drobnak
afd28fab03
Merge pull request #2767 from pi-hole/fix/multiple_pihole-FTL_PIDs
...
Improve PID detection in pihole-FTL.service
5 years ago
Mark Drobnak
d92ced6fb6
Merge pull request #2734 from pi-hole/fix/query_black_and_whitelists_database
...
Query black and whitelists database
5 years ago
DL6ER
ae98fde321
Try to obtain PID from PIDFILE. If this fails (file does not exist or is empty), fall back to using pidof + awk
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
9ddce88092
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
44f8fcb600
We can print the table name without any extra check as we already returned early in case there are no results.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Mark Drobnak
814fdcf9b6
Merge pull request #2768 from pi-hole/fix/dhcp-ignore-names
...
Add dhcp-ignore-names option when enabling DHCP service
5 years ago
DL6ER
5060605626
Print table name before entering the loop for the sake of simplicity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
453ba14cbd
Merge pull request #2758 from pi-hole/fix/debug-log-gravity-database
...
Update debug script with gravity DB changes
5 years ago
DL6ER
285e6fe090
Address lint complaints
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
c3023fe681
Add new "pihole arpflush" command to flush both the ARP cache as well as the network table in pihole-FTL.db
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
c5df104a66
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
f6213d4f4d
Use last PID in case pidof returns multiple PIDs for pihole-FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Mark Drobnak
ca2ea388b7
Merge pull request #2763 from chrisys/development
...
Handle an empty local.list
5 years ago
Chris Crocker-White
69dba022c4
Handle an empty local.list
...
Handle the case of an empty local.list file which would otherwise prevent the system from starting
Change-type: patch
Signed-off-by: Chris Crocker-White <chriscw@balena.io>
5 years ago
Mcat12
bfb99c361c
Note that the gravity size does not include the blacklist entries
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
5796054305
Increase ID column width to 4
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
a3e1473ac1
Set explicit column widths to prevent text from getting cut off
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
7b5fc60e00
Improve table formatting
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
807ce0af4e
Show whitelist, blacklist, and regexlist details
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
3f05efd60f
Add extra newline
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
03d93aa19a
Update debug script with gravity DB changes
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
DL6ER
cad9386ff6
Merge pull request #2750 from pi-hole/release/v4.3
...
Update Dev with v4.3 fixes
5 years ago
Dan Schaper
7de6bbca61
Merge branch 'development' into release/v4.3
5 years ago
Mark Drobnak
c8d32e0dd3
Merge pull request #2743 from haguenau/fix/shellcheck-install-script
...
Clean up basic install script
5 years ago
David Haguenauer
be3a21ae07
Put quotes at ends of strings
...
Signed-off-by: David Haguenauer <ml@kurokatta.org>
5 years ago
David Haguenauer
69081a9175
Drop indirection from install_dependent_packages
...
Previously, install_dependent_packages would receive an array variable
name as its single parameter, and would use variable indirection to
access it; this change simplifies that function so that it instead
receives the expanded array.
Signed-off-by: David Haguenauer <ml@kurokatta.org>
5 years ago
David Haguenauer
ab2f8a0c09
Quote variables in basic-install.sh
...
This greatly reduces the number of warnings emitted by ShellCheck, and
in turn should make it more likely that errors are caught in the
future.
Signed-off-by: David Haguenauer <ml@kurokatta.org>
5 years ago
Mark Drobnak
b961a501bb
Merge pull request #2611 from pi-hole/new/gravitydb
...
Store blocking domains in a database
5 years ago
Mcat12
8e1bf6e3d4
Merge branch 'development' into new/gravitydb
...
# Conflicts:
# advanced/Scripts/list.sh
# gravity.sh
# pihole
5 years ago
Mark Drobnak
d6756eb46b
Merge pull request #2730 from pvogt09/development
...
Adds world readable attribute to files created by Pi-hole to circumve…
5 years ago
pvogt09
efbd42f7b5
Moves creation of pihole user before FTL installation
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
3f90261520
Moves chmod after every creation of ${destination} instead of end of function
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
Mark Drobnak
ff5894d772
Merge pull request #2744 from pi-hole/fix/cron-job-errors-untagged
...
Fix for preventing git error message in cron logs
5 years ago
pvogt09
225285cb97
Removes chmod for ${source} and superfluous chmod for ${destination}
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
mpiederiet
3220e2b978
Fix for preventing git error message in cron logs
...
Fix to prevent "fatal: No names found, cannot describe anything" git message during scheduled update checks
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
54ae458b61
Merge pull request #2733 from pi-hole/fix/debug-curl
...
Pi-hole Debug - tricorder upload function calls
5 years ago
pvogt09
e076db5a4e
Changes ownership of macvendor.db to pihole
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago