Adam Warner
7807a93e10
If PIHOLE_DOCKER_TAG is set, then include that info in the debug run ( #4515 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
yubiuser
241e53ed45
Skip debug upload question if called from web interface ( #4494 )
...
* Skip debug upload question if called from web interface
Signed-off-by: Christian König <ckoenig@posteo.de>
* Suppress upload error if users opt-out from uploading from web interface
Signed-off-by: Christian König <ckoenig@posteo.de>
* Fix and reverse logic
Signed-off-by: Christian König <ckoenig@posteo.de>
* Remove addtional space
Signed-off-by: Christian König <ckoenig@posteo.de>
* Include reviewer's comment :D
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Omoeba
5b84cd0a61
Fix IPv6 support when Pi-hole is a router
...
Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
2 years ago
yubiuser
920cf6de14
Check for updates on master based on tags not commits ( #4475 )
...
* Check for updates on master based on tags not commits
Signed-off-by: Christian König <ckoenig@posteo.de>
* Fix stickler
Signed-off-by: Christian König <ckoenig@posteo.de>
* Address reviewer's comments
Signed-off-by: Christian König <ckoenig@posteo.de>
* Fix stickler again
Signed-off-by: Christian König <ckoenig@posteo.de>
* Use local git instead of relying on github
Signed-off-by: Christian König <ckoenig@posteo.de>
* Add --tags
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
2 years ago
DL6ER
1eb31174a5
Merge pull request #4455 from pi-hole/comment
...
Add comment help text to list function
2 years ago
yubiuser
ff4487ff74
Escape quotes
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
2 years ago
yubiuser
669f1b0f4a
Address reviewer's comment
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
2 years ago
DL6ER
31de661bbb
Merge pull request #4414 from pi-hole/debug/custom.list
...
Add custom.list (Local DNS Records) to debug log
2 years ago
DL6ER
c0f454ddfa
Add new interface listening option "bind" ( #4476 )
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2 years ago
Christian König
b52a3a021d
Add comment help text to list function
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Subhaditya Nath
ba6d700e7e
Fix `pihole -v` output if WebAdmin not installed ( #4370 )
...
* Fix https://github.com/pi-hole/pi-hole/issues/4279
Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>
* Don't ignore exit code of version.sh
If it exits with a non-zero return code, that means some error occurred,
and so it shouldn't be ignored.
Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>
* Implement changes suggested by @Michalng
Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>
* Implement changes suggested by @PromoFaux
Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>
* Always source /etc/pihole/setupVars.conf
https://github.com/pi-hole/pi-hole/pull/4370#issuecomment-978149567
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
jbzdarkid
bc8150adfa
Clean up bash script formatting
...
Done with the help of beautysh (a python-based bash formatter)
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
3 years ago
Christian König
e733553295
Remove unused code from webpage.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
c1eb35a35e
Add custom.list (Local DNS Records) to debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
596689b4c9
Validate host/domain of Local DNS records as well
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
a872fabe7d
Validate on removal as well
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
bc21a7155d
Add option to not reload
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
b7bba6a689
Validate when adding not when removing
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
16fb6665ec
Merge pull request #4380 from pi-hole/df
...
Include df -h in debug log
3 years ago
Christian König
d84da71310
Only show lines not containing sensitive keywords
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
77a30ac0c2
Use mapfile
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
fdc4cf9869
Fix stickler
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
a0ecfcc1dc
Include df -h in debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
b30d729aa4
Simplify vw_adlist
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
yubiuser
f3acc7c839
Make debug log file size human readable ( #4350 )
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Adam Warner
55dce14655
Add execution bit accidentally dropped in #4106 ( #4368 )
...
Add some smoke tests for the repository.
- Add x bit to piholeCheckout.sh. Possibly not needed, but consistency is no bad thing
- Ensure all files in script directorys have executable bit set
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
Andras Tim
541257849d
List fix: no reload ( #3981 )
...
* scripts/list: Fixed --noreload options
We should differentiate the ability and the needings.
Signed-off-by: Andras Tim <andras.tim@gmail.com>
* scripts/list: Removed unnecessary tailing whitespaces
Signed-off-by: Andras Tim <andras.tim@gmail.com>
* Update advanced/Scripts/list.sh
Signed-off-by: Andras Tim <andras.tim@gmail.com>
* Merge bash conditions according to MichaIng suggestion
Co-authored-by: micha@dietpi.com
Signed-off-by: Andras Tim <andras.tim@gmail.com>
3 years ago
yubiuser
38bb4a4908
Remove unused wildcard_regex_converter.sh ( #4369 )
...
* Remove unused wildcard_regex_converter.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
* Remove regexconverter
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
yubiuser
6d670991c3
Perform a check of required packages befor updating pihole ( #4326 )
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
89b1cfcd85
Merge pull request #4243 from yubiuser/debug_dnsmasq
...
Include all files in the dnsmasq config dir in the debug output
3 years ago
DL6ER
0df099a6a5
Merge pull request #4312 from yubiuser/debug_dnsmasq.conf
...
Add content of /etc/dnsmasq.conf to debug output
3 years ago
DL6ER
d0e8b0c962
Forward unqualified names to the CF target only when the "Never forward non-FQDN" option is NOT ticked
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Dan Schaper
d48d3aba69
Merge pull request #4305 from pi-hole/tweak/debug_curl
...
Use --no-progress-meter instead of --silent so error reasons are printed
3 years ago
DL6ER
cbc99d45c6
Small style change to finished debug upload display
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
be68a5339c
Apply same improvement to pihole tricorder feature
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
606b05eec1
Ensure curl is either storing a valid token or a meaningful error message
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Christian König
6941155572
Add content of /etc/dnsmasq.conf to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
6fec4acd82
Add content of /etc/resolv.conf to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
b241a19e87
Use --no-progress-meter instead of --silent so error reasons are printed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
21897d7fbd
Add warning if curl failed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
06fd8123c3
Also remove "rev-server" lines when rewriting 01-pihole.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
c2f3477a82
Ensure conditional forwarding will forward unqualified host names if we have no local answer for them.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
yubiuser
ee749f700f
Add switching 'to...from' message to ftl checkout output ( #4266 )
...
* Add switching 'to...from' message to ftl checkout output
Signed-off-by: Christian König <ckoenig@posteo.de>
* Add quotes
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
yubiuser
bb7c7cdf33
Add uptime to debug log ( #4265 )
...
* Add uptime to debug log
Signed-off-by: Christian König <ckoenig@posteo.de>
* Address github comments
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Dan Schaper
b729a44209
Merge pull request #4246 from pi-hole/tweak/debug_noipcheck
...
Remove comparison of IP addresses with setupVars.conf
3 years ago
Adam Warner
5a55fa5e48
Merge pull request #4263 from pi-hole/tweak/debugports
...
Update debug for new back end.
3 years ago
Adam Warner
d419eaf463
Merge branch 'development' into release/v5.4
3 years ago
Dan Schaper
2ec4e84db4
Merge branch 'development' into fix-logrotate-conflict
3 years ago
Dan Schaper
075b3f6468
Remove ports, nc option and fix wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
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>
3 years ago
Christian König
aa2da80768
Remove traces of unused files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
b05fc5bb2b
Remove specific dnsmasq config files from requiered files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
c99c86af7f
Make all dir list output human readable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
f552173be3
Resolve merge conflict
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
d02aa3ced1
Fix error on checking interfaces that are not dual-stack
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
fbfec961d5
Remove comparison of IP addresses with setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Christian König
0c125eba2c
Make output of SHM dir human readable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Kenneth Chew
092e533a30
Add `-t` option to Admin Console help dialog
...
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
3 years ago
Faye Duxovni
aa5c15a728
give pihole its own logrotate state file
...
Signed-off-by: Faye Duxovni <duxovni@duxovni.org>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Daniel
fdca19e66d
Support and test Debian Bullsye (11)
...
Signed-off-by: Daniel <daniel@developerdan.com>
3 years ago
DL6ER
a0d74d1e9d
Canary domain handling is now happening in FTL where we have much finer control over it.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
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
3 years ago
Adam Warner
e80e54a61a
head_line -> line
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
Adam Warner
9b9e907013
Merge branch 'development' into debug_tail_log
3 years ago
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist
3 years ago
Adam Warner
a1d85155fd
Merge pull request #4178 from pi-hole/fix/custom_dns_removal
...
Add missing sed anchors when deleting lines.
3 years ago
Dan Schaper
01764cc581
Explicity declare values for the RA packet.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Christian König
08cf9aa5a7
Declare and assign 'logging_enabled' separately
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
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>
3 years ago
Christian König
f2cba6cad1
Skip analyze_pihole_log if query logging has been disabled
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
df3c46349a
Add tail of pihole.log to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
a9e761ec13
Add missing sed anchors when deleting lines.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Adam Warner
5895690b58
this has been annoying me for months
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
DL6ER
3b574096b8
Remove duplicated lo test
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
58905a1188
Modify debugger to test name resolution on all available interfaces
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Adam Warner
b388ac5bb5
Merge pull request from GHSA-3597-244c-wrpj
...
Add some validation to passed arguments before running the values through `sed`
3 years ago
Adam Warner
45d4ab4c22
Add some validation to passed arguments before running the values through `sed`
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
DL6ER
f536718aaa
Use possibly custom gravity.db location in the copying SQL script
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
f1740da9ff
Update gravity path in query.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
9bdbe88a66
Update gravity path in list.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Dan Schaper
f27fd9f899
Merge pull request #3982 from andras-tim/list-fix-same-wildcard-regex
...
Fix list: User same wildcard regex that the UI use
3 years ago
DL6ER
57fe3b6621
Merge pull request #3951 from pi-hole/new/gravity_adlist_infos
...
Store gravity details in gravity.db adlist table
3 years ago
Christian König
78027bd2bf
Add default noname if hostname is empty
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
7dc7cbb80e
Add hostname to teleporter backup file if called from cli
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Alexander Schmitz
1ab193fa9d
Update piholeDebug.sh
...
Signed-off-by: Alexander Schmitz <Flashbang007@gmail.com>
3 years ago
freddii
7c0c30fb0b
fixed typos
3 years ago
Andras Tim
bfee230c79
scripts/list: User same wildcard regex that the UI use
...
The CLI and the UI should do the same to be able to add/remove the same
records via any supported interface.
Signed-off-by: Andras Tim <andras.tim@gmail.com>
3 years ago
DL6ER
1791fe22f6
Merge pull request #3912 from mdujava/basic_auth
...
Fix validation of adlist url
3 years ago
DL6ER
e033ee6664
Fix connection mechanism between Chronometer and FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
6b33b8b4c0
Store status of downloaded list (downloaded, using cache, some error, ...) and number of (in-)valid domains on this list in the gravity database. This updates the gravity databaes to version 14.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Matej Dujava
ef0bdf6470
Fix validation of adlist url
...
Already existing regex validation will be used on url after removing @ (in case
its in separating userinfo and host).
Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
Fixes: https://github.com/pi-hole/pi-hole/issues/3911
Fixes: 7d19ee1b: validate blocklist URL before adding to the database (#3237 )
3 years ago
DL6ER
41479524f8
Merge pull request #3900 from ganto/fix/chrono-non-lte
...
Fix chronometer output if web interface is not installed
3 years ago
Adam Warner
357b6702ec
Update advanced/Scripts/chronometer.sh
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
3 years ago
DL6ER
78cdd34992
Merge pull request #3904 from ganto/fix/debug-non-web-2
...
piholeDebug: Diagnose output if (Web) git directory is not found
3 years ago
Reto Gantenbein
9dc539c98b
piholeDebug: More detailed diagnostics if Web interface is not found
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
Reto Gantenbein
18e4eb460c
piholeDebug: Fix version check if lighttpd/php are not installed
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
Reto Gantenbein
e841347057
Fix chronometer output if web interface is not installed
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
Adam Warner
8443262214
Merge pull request #3890 from ganto/fix/x86-64-arch
...
Ensure x86_64 processor architecture is listed as supported
4 years ago
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>
4 years ago
Reto Gantenbein
d0af1a950b
Ensure x86_64 processor architecture is listed as supported
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago