Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-27 07:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
5655 commits 10 branches 109 tags 28 MiB
Commit graph

1868 commits

Author SHA1 Message Date
Christian König
2dd08f070e
Fix copy&paste error 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-05-15 23:30:02 +02:00
Christian König
0961103933
Add backward compatibility to FTL service by creating symlinks 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-05-15 22:10:40 +02:00
Adam Warner
82695aba7d update LOG_DIRECTORY variable in debug script 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-05-15 07:09:27 +02:00
Adam Warner
36dd533ef3 use directory /var/log/pihole/ for log storage 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-05-15 06:46:23 +02:00
yubiuser
0decc1252b
Respect user configurable path for pid and port file in pihole-FTL.service (#4680) 
* Use pid file in pihole-FTL.service

Signed-off-by: Christian König <ckoenig@posteo.de>
Co-authored-by: MichaIng <micha@dietpi.com>
 2022-05-11 16:03:44 -07:00
Omoeba
f7c800863e
Remove DHCPv6, use leasetime from interface (#4507) 
Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
 2022-05-11 11:57:42 -07:00
Adam Warner
d78c689e55
no more alphabetical order 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-21 19:56:21 +01:00
Adam Warner
c9e76c978e
Update advanced/Scripts/webpage.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
 2022-04-17 13:39:55 +01:00
Adam Warner
23e6fa1ec5
Replace wrapper function calls with direct utils.sh calls. Leave warpper functions until next release as docker currently uses them, and new changes to utils.sh need to be in the master branch before docker can use them 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-15 09:50:40 +01:00
Adam Warner
db116971ce
I tried to do too many things in one function, vastly overcomplicating what should have been _this_ all along 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-14 22:53:38 +01:00
Adam Warner
86dd612882
remove readonly directive from declaration of utilsfile, it is unnecassery 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-12 17:13:50 +01:00
yubiuser
d3e94cbceb
Merge pull request #4653 from pi-hole/refactor-utils-redux 
Tweaks to functions in utils.sh and refactored usages in webpage.sh
 2022-04-04 23:25:54 +02:00
yubiuser
9b4f6c84cd
Minor review comments 2022-04-04 23:14:10 +02:00
Adam Warner
4d31d5ee11
Address review comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-04 22:02:26 +01:00
Christian König
e4a1f3a175
Rename block lists to adlists within the query list functions 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-04 13:52:26 +02:00
Adam Warner
0d74b27101
Merge pull request #4646 from pi-hole/tweak/debug_message 
Pool identical messages in debug output
 2022-04-02 13:14:44 +01:00
Adam Warner
7fa8cdd03e
Address: 
- Review Comments
 - Stickler Complaints
 2022-04-02 12:46:07 +01:00
Adam Warner
fe9031b26f
Merge pull request #4669 from pi-hole/master 
sync: master to development
 2022-04-02 00:05:49 +01:00
Dan Schaper
b714c4598a
Found it. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-01 14:49:30 -07:00
Dan Schaper
0f192998eb
Create empty files. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-01 14:17:57 -07:00
Dan Schaper
8a5c7dec71
Ensure existing files are proper owner and mode. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-04-01 14:08:09 -07:00
RD WebDesign
5cebceadda Remove @ and following character from interface name 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-03-30 21:32:18 -03:00
RD WebDesign
f8e84b3c3f Fix stickler 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-03-23 18:45:18 -03:00
RD WebDesign
c9809371ab Selecting the protocol 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-03-23 18:33:15 -03:00
RD WebDesign
0d4c69cc6f Add check to avoid error in PHP 8 
and return some information about the unexpected value

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-03-21 18:59:46 -03:00
Adam Warner
59fc3804be
Make utils.sh posix compatible per request 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-03-16 20:40:25 +00:00
Adam Warner
48138d32b6
Adjust addOrEditKeyValPair to optionally take two or three arguments (adjust test to suit) 
Add a removeKey function with test

update webpage.sh to reference functions in utils.sh (this can likely be abstracted/refactored further)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-03-16 17:42:01 +00:00
RD WebDesign
ab7d83384f Allow lighttpd to stream responses to browser 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-03-15 15:33:56 -03:00
Christian König
48136c5bbc
Add last timestamp 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-03-14 19:54:46 +01:00
Christian König
0219e5dfe0
Pool identical messages in debug output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-03-12 21:00:48 +01:00
Adam Warner
0631cb4984
Merge pull request #4645 from rdwebdesign/color_debug_web 
Generate colorful debug logs to web interface
 2022-03-12 18:02:49 +00:00
RD WebDesign
40b96e673b Allows colorful debug logs via web interface 
Note: needs the AdminLTE code changes to work.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-03-12 02:58:46 -03:00
Christian König
42424b515b Add getFTLAPIPort function 
Add ftl_api_port function

Signed-off-by: Christian König <ckoenig@posteo.de>

Use getFTLAPIPort in pihole

Signed-off-by: Christian König <ckoenig@posteo.de>

Use default portfile as fallback

Signed-off-by: Christian König <ckoenig@posteo.de>

Fix stickler

Signed-off-by: Christian König <ckoenig@posteo.de>

Correct variables

Signed-off-by: Christian König <ckoenig@posteo.de>

Apply suggestions from code review

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>

Add test getFTLAPIPort returing default port

Signed-off-by: Christian König <ckoenig@posteo.de>

Remove unused code from test_key_val_replacement_works

Signed-off-by: Christian König <ckoenig@posteo.de>

Add getFTLAPIPort_custom test

Signed-off-by: Christian König <ckoenig@posteo.de>

Fix output format

Signed-off-by: Christian König <ckoenig@posteo.de>

Add debugging

Signed-off-by: Christian König <ckoenig@posteo.de>

Remove debugging and fix function

Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-02-27 18:16:53 +01:00
DL6ER
91b4233d3a
Add backend option to set rate-limit from the dashboard 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-02-19 14:46:32 +01:00
Christian König
f4286a4d12
Fix log flush with new query database schema 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-02-12 23:33:19 +01:00
Adam Warner
08999bf315
Use case insensitive deletion when removing custom CNAME/DNS records in case of manual entries with mixed case having been added 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-02-04 21:16:02 +00:00
Adam Warner
2bd670a3dd
Merge pull request #4582 from lschloetterer/patch-1 
add parameter to set filename for teleporter
 2022-02-04 20:44:49 +00:00
Lukas Schlötterer
2a0bb5b9ee Create second entry for teleporter and adjust spacing 
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-02-04 21:29:23 +01:00
DL6ER
844c4dcdc8
Merge pull request #4584 from pi-hole/fix/gravity_internal_sqlite3 
Replace calls to sqlite3 by calls to pihole-FTL sqlite3
 2022-02-03 05:45:04 +01:00
Lukas Schlötterer
881d92632c
add hint for custom teleporter filename to help function 
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-02-01 09:41:57 +01:00
DL6ER
76d4e1209f
Merge pull request #4585 from pi-hole/tweak/sed-add-if-not-exists 
Replace value for BLOCKING_ENABLED, add if it does not already exist
 2022-02-01 07:45:34 +01:00
Adam Warner
77e5121d43
Split new function out into a separte utility script and add a test for it. Can be used in future to organise re/commonly-used code 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-30 23:05:28 +00:00
DL6ER
74d7d10554
Orphans need to be deleted in the old database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 21:09:24 +01:00
DL6ER
8cbffa179d
Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 11:18:17 +01:00
DL6ER
5bb79de70b
Clean possible leftovers in domainlist_by_group, adlist_by_group, and client_by_group before copying from database base to avoid foreign key violations. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 10:38:24 +01:00
Lukas Schlötterer
bad6d8a59e
add parameter to set filename for teleporter 
Make it possible to write pihole -a -t myname.tar.gz to configure the filename however you want

Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-01-28 16:26:57 +01:00
Christian König
7aa28e4a3a
Do a full fetch 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-22 22:09:15 +01:00
RD WebDesign
6ead24b315
Move space into variable (#4562) 
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
 2022-01-14 17:00:34 +01:00
DL6ER
ec3a5c2989
Merge pull request #4543 from pi-hole/tweak/debug_ipaddr 
Include ip addr show and ip route show in debug log
 2022-01-09 12:53:37 +01:00
DL6ER
b20b38d44f
Include ip addr show and ip route show for us to help with local-service issues (where hops-away is measured) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-09 12:38:22 +01:00
Christian König
a65a841c56
Remove oneline from ss call 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-09 07:13:51 +01:00
Adam Warner
3097c8fbdc
Skip the required ports check if installed in docker container. Unpriv'ed containers do not have access to the information required to resolve the service name listening - and the container should not start if there was a port conflict anyway (#4536) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-08 13:57:49 +01:00
Christian König
81698ef1ed
Fix Pi-hole status in chronometer 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-05 21:09:57 +01:00
DL6ER
5823f5e254
Use ss instead of lsof (#4518) 
* Use ss instead of lsof for pihole status checks

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

* Use ss FILTER instead of piping into bash

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

* Use ss in debug log generation

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

* Remove lsof from dependencies

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-05 16:41:46 +00:00
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>
 2022-01-04 21:46:06 +00:00
yubiuser
c6a2a6f739
Install pihole-FTL.conf template on fresh installation (#4496) 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-04 19:09:30 +00:00
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>
 2022-01-04 19:06:41 +00:00
Omoeba
5b84cd0a61
Fix IPv6 support when Pi-hole is a router 
Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
 2022-01-03 04:02:01 -08:00
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>
 2021-12-22 18:21:44 +00:00
DL6ER
1eb31174a5
Merge pull request #4455 from pi-hole/comment 
Add comment help text to list function
 2021-12-21 22:26:05 +01:00
yubiuser
ff4487ff74
Escape quotes 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2021-12-21 22:10:56 +01:00
yubiuser
669f1b0f4a
Address reviewer's comment 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2021-12-21 12:58:39 +01:00
DL6ER
31de661bbb
Merge pull request #4414 from pi-hole/debug/custom.list 
Add custom.list (Local DNS Records) to debug log
 2021-12-21 12:37:11 +01:00
DL6ER
3a67d1cf8d
Merge pull request #4461 from pi-hole/qr_iframe 
Companion to pi-hole/adminlte #1996
 2021-12-20 21:51:05 +01:00
DL6ER
c0f454ddfa
Add new interface listening option "bind" (#4476) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-12-20 21:36:19 +01:00
Christian König
28085cf7d8
Merge iFrame exceptions 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-17 10:08:16 +01:00
Christian König
2eff53b2bb
Allow qr code iframe 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-10 07:17:53 +01:00
Christian König
8d6ce78c65
Allow qr code iframe 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-10 07:09:42 +01:00
Christian König
b52a3a021d
Add comment help text to list function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-06 20:30:37 +01:00
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>
 2021-12-02 20:46:11 +00:00
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>
 2021-11-25 14:12:09 -08:00
Christian König
e733553295
Remove unused code from webpage.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-11-02 21:22:14 +01:00
David Irvine
c6da1a3918 Fix documentation; add some missing zones 
Signed-off-by: David Irvine <aviddiviner@gmail.com>
 2021-10-28 12:09:34 +02:00
Christian König
c1eb35a35e
Add custom.list (Local DNS Records) to debug log 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-26 22:46:52 +02:00
Christian König
596689b4c9
Validate host/domain of Local DNS records as well 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-19 21:34:16 +02:00
Christian König
a872fabe7d Validate on removal as well 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-17 20:56:08 +02:00
Christian König
bc21a7155d Add option to not reload 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-12 19:53:59 +02:00
Christian König
b7bba6a689 Validate when adding not when removing 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-12 19:32:55 +02:00
DL6ER
16fb6665ec
Merge pull request #4380 from pi-hole/df 
Include df -h in debug log
 2021-10-11 19:09:22 +02:00
Christian König
d84da71310 Only show lines not containing sensitive keywords 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-11 18:02:47 +02:00
Christian König
77a30ac0c2 Use mapfile 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-11 17:31:03 +02:00
DL6ER
19ae9d3ee6
Merge pull request #4375 from pi-hole/companion/adminlte-1231 
Companion to pi-hole/adminlte #1231
 2021-10-10 19:03:59 +02:00
DL6ER
d03aa0c0c7
Merge pull request #4379 from pi-hole/tweak/vw_adlist 
Simplify vw_adlist
 2021-10-10 07:11:05 +02:00
yubiuser
3c41ec08a3
Set file permission for querie database in pihole-FTL.service (#4328) 
* Set file permission for querie database in pihole-FTL.service

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use -f flag for chmod of the macvendor.db

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fix missing space

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fix spelling

Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-08 22:54:23 +01:00
Christian König
fdc4cf9869 Fix stickler 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-08 21:54:50 +02:00
Christian König
a0ecfcc1dc Include df -h in debug log 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-08 21:50:46 +02:00
Christian König
b30d729aa4 Simplify vw_adlist 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-08 21:08:10 +02:00
Adam Warner
f8af1a1baa
Allow iFrame for teleporter.php, see https://github.com/pi-hole/AdminLTE/pull/1231 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-10-07 00:16:07 +01:00
yubiuser
f3acc7c839
Make debug log file size human readable (#4350) 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-06 15:19:25 -07:00
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>
 2021-10-05 19:34:51 +01:00
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>
 2021-10-05 15:52:51 +01:00
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>
 2021-10-05 13:09:16 +01:00
DL6ER
b755330f4c
Remove local-ttl from set of default dnsmasq options. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-24 11:34:05 +02:00
yubiuser
6d670991c3
Perform a check of required packages befor updating pihole (#4326) 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-09-12 13:38:55 -07:00
Adam Warner
62f29ba3fa
Merge branch 'release/v5.4' into development 2021-09-11 21:35:11 +01:00
DL6ER
89b1cfcd85
Merge pull request #4243 from yubiuser/debug_dnsmasq 
Include all files in the dnsmasq config dir in the debug output
 2021-09-11 22:20:00 +02:00
Adam Warner
89e187947e
Merge pull request #4282 from pi-hole/new/RFC6761 
Install RFC6761 config file
 2021-09-11 20:44:46 +01:00
Adam Warner
d2faa93241
Merge pull request #4314 from pi-hole/fix/capabilities 
Add possibly missing capabilities
 2021-09-11 20:44:24 +01:00
DL6ER
0df099a6a5
Merge pull request #4312 from yubiuser/debug_dnsmasq.conf 
Add content of /etc/dnsmasq.conf to debug output
 2021-09-11 21:42:36 +02:00
DL6ER
482ac12c9b
Merge pull request #4275 from MichaIng/patch-4 
Remove ineffective Access-Control-Allow-Origin header
 2021-09-11 21:41:49 +02:00
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>
 2021-09-09 20:28:33 +02:00
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
 2021-09-07 09:33:25 -07:00
DL6ER
cbc99d45c6
Small style change to finished debug upload display 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-07 11:21:34 +02:00
DL6ER
be68a5339c
Apply same improvement to pihole tricorder feature 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-07 11:16:40 +02:00
DL6ER
606b05eec1
Ensure curl is either storing a valid token or a meaningful error message 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-07 11:13:09 +02:00
DL6ER
a1ee7d92a9
Add possibly missing capabilities 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-06 22:38:16 +02:00
Christian König
6941155572 Add content of /etc/dnsmasq.conf to debug output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-09-06 17:16:36 +02:00
Christian König
6fec4acd82 Add content of /etc/resolv.conf to debug output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-09-05 20:44:39 +02:00
DL6ER
b241a19e87
Use --no-progress-meter instead of --silent so error reasons are printed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-30 21:19:47 +02:00
DL6ER
21897d7fbd
Add warning if curl failed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-30 15:55:42 +02:00
DL6ER
06fd8123c3
Also remove "rev-server" lines when rewriting 01-pihole.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-20 16:26:17 +02:00
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>
 2021-08-20 15:54:25 +02:00
DL6ER
e8e8104b36
Remove server=/local/ because of https://github.com/pi-hole/pi-hole/pull/4282#discussion_r689112972 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-15 18:37:12 +02:00
DL6ER
ea5a3bf0b2
Install RFC6761 config file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-15 11:21:24 +02:00
Adam Warner
c88c943cda
Merge branch 'release/v5.4' into dev-release5.4 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-13 20:24:35 +01:00
MichaIng
3ef90a9e47 Remove ineffective Access-Control-Allow-Origin header 
The Access-Control-Allow-Origin header has only relevance, when a resource is loaded from an external host, so one that does not match the host of the primary loaded website. As the fonts are reasonably loaded via local URLs without hostname or scheme from the blocking page style sheet, they are never seen as external resources, regardless whether the blocking page is shown to the browser from a blocked domain or from the Pi-hole domain/IP.

For reference: https://github.com/pi-hole/pi-hole/issues/3462

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-08-13 20:42:51 +02:00
Christian König
676b7e60f3 Fix Splashpage not appearing properly on non-root directories 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-08-12 13:55:40 +02:00
DL6ER
43b88cd628
Merge pull request #4236 from MichaIng/patch-4 
Update pihole-FTL.service
 2021-08-10 16:09:41 +02:00
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>
 2021-08-07 20:07:45 +02:00
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>
 2021-08-07 20:07:14 +02:00
Adam Warner
913dcead7f
move chmod/chown of macvendor.db to pihole-FTL.service 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 19:02:36 +01:00
Dan Schaper
b729a44209
Merge pull request #4246 from pi-hole/tweak/debug_noipcheck 
Remove comparison of IP addresses with setupVars.conf
 2021-08-05 09:34:08 -07:00
Adam Warner
5a55fa5e48
Merge pull request #4263 from pi-hole/tweak/debugports 
Update debug for new back end.
 2021-08-05 17:12:37 +01:00
Adam Warner
d419eaf463
Merge branch 'development' into release/v5.4 2021-08-05 17:05:12 +01:00
Dan Schaper
2ec4e84db4
Merge branch 'development' into fix-logrotate-conflict 2021-08-05 07:45:31 -07:00
Dan Schaper
075b3f6468
Remove ports, nc option and fix wording. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-08-04 20:57:09 -07:00
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
MichaIng
57c40cbd09 Update pihole-FTL.service 
Make this script a bourne shell script, which requires the removal of only a single bashism, the "{n..m}" expansion. Furthermore, since POSIX echo has no reliable command line options, switch to printf when line breaks shall be omitted. On most distros/setups "sh" calls a much lighter bourne shell like dash, which inits and runs much faster than bash.

Remove unused PIDFILE variable, remove the single case of FTLUSER call and remove it as well. Using variables here might give the wrong impression that there is a change these can be varied. But both are hardcoded in many places throughout Pi-hole, so in this service script.

Consolidate and merge the commands to pre-create and set permissions for required files and directories. The /var/log/pihole directory is and was never used, the touch, chmod and chown call can be merged into one each to reduce overhead. Use "-f" option to to fail on missing database files instead of redirecting STDERR, which is otherwise helpful to debug other possible errors, like missing or corrupted commands, filesystem errors and such.

Do not use "which pihole-FTL" when setting capabilities when the hardcoded path /usr/bin/pihole-FTL is used for the actual daemon call. It makes sense to use the full path here, as the Pi-hole installer and updater installs it explicitly there, and so we prevent users from e.g. overriding it via /usr/local/bin/pihole-FTL too easily.

On pgrep and pkill calls, add the "-x" flag to assure that only "pihole-FTL" is matched and not "foo-pihole-FTL" or "pihole-FTL-bar".

Do not remove possible leftovers from previous pihole-FTL processes on start, but on stop instead. Since "start" includes a proceeding "stop" as well, on service start nothing changes, but on service stop, some resources are now freed.

Remove leading "$" from usage message. In bash this was omitted, as $'...' is a special syntax for escape sequence expansion, which is not applicable here. In dash it would be printed literally. To keep previous behaviour, it is hence removed.

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-07-24 14:55:54 +02:00
Kenneth Chew
092e533a30
Add -t option to Admin Console help dialog 
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2021-07-18 14:31:37 -04:00
Adam Warner
3b6e6317b8
Merge pull request #4126 from lightswitch05/feature/support-and-test-debian-bullseye 
Support and test Debian Bullsye (11) and Ubuntu 21.04
 2021-07-15 19:11:26 +01:00
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>
 2021-07-09 20:00:10 -04: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
c9e341b5d4
Same change as with #4221, but on fedora config too 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-07 19:20:14 +01:00
Daniel
31a096dec2
Remove mod_compress (mod_deflate) from lighttpd to provide backwards compatible support for Debian Bullseye (11) 
Signed-off-by: Daniel <daniel@developerdan.com>
 2021-07-07 13:31:59 +00:00
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>
 2021-07-04 13:55:47 +02: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
Adam Warner
9b9e907013
Merge branch 'development' into debug_tail_log 2021-07-04 00:53:14 +01:00
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist 2021-07-04 00:48:09 +01:00
Adam Warner
a1d85155fd
Merge pull request #4178 from pi-hole/fix/custom_dns_removal 
Add missing sed anchors when deleting lines.
 2021-07-04 00:35:00 +01:00
Dan Schaper
01764cc581
Explicity declare values for the RA packet. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-06-20 10:28:25 -07: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
a9e761ec13
Add missing sed anchors when deleting lines. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-05-23 12:11:04 +02:00
Adam Warner
5895690b58
this has been annoying me for months 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-04-24 15:38:27 +01: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
Dan Schaper
9b57f7fa33
Merge pull request #4120 from pi-hole/fix/splashPage 
Add missing closing single quote
 2021-04-14 13:50:45 -07:00
Dan Schaper
866045968d
Add missing closing single quote 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-04-14 12:27:36 -07:00
Adam Warner
b388ac5bb5
Merge pull request from GHSA-3597-244c-wrpj 
Add some validation to passed arguments before running the values through `sed`
 2021-04-14 18:16:46 +01:00
Adam Warner
ea451e3c22
Merge pull request #4095 from jbaez/ft-3896 
Fix error trying to access undefined variables on splash page.
 2021-04-12 20:41:25 +01:00
Jaime Baez
6198165df8 Fix error trying to access undefined variables on splash page. 
Signed-off-by: Jaime Baez <j.baezcastillo@gmail.com>
 2021-03-26 23:42:11 +01:00
Adam Warner
45d4ab4c22
Add some validation to passed arguments before running the values through sed 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-03-19 18:39:43 +00:00
DL6ER
f536718aaa
Use possibly custom gravity.db location in the copying SQL script 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-03-18 16:46:59 +01:00
DL6ER
f1740da9ff
Update gravity path in query.sh 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-03-18 09:58:19 +01:00
DL6ER
9bdbe88a66
Update gravity path in list.sh 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-03-18 09:58:19 +01:00
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
 2021-03-17 11:20:12 -07:00
Dany
13cf0c1288
Aligned pihole logo to center, Fixed responsive issue (#4036) 
* Aligned pihole logo to center, Fixed responsive issue

* removed duplicate instance of #splashpage

Signed-off-by: Dany Gauthier <danygauthier57@yahoo.ca>
 2021-03-17 11:18:50 -07:00
DL6ER
57fe3b6621
Merge pull request #3951 from pi-hole/new/gravity_adlist_infos 
Store gravity details in gravity.db adlist table
 2021-02-28 17:01:19 +01:00
Adam Warner
56fa9714b5
Merge pull request #4010 from mtzfederico/master 
Updates lighttpd config to allow a persistent port change on IPv6
 2021-02-28 14:42:21 +00:00
Christian König
78027bd2bf Add default noname if hostname is empty 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-02-12 20:25:01 +01:00
Christian König
7dc7cbb80e Add hostname to teleporter backup file if called from cli 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-02-11 19:45:32 +01:00
Alexander Schmitz
1ab193fa9d
Update piholeDebug.sh 
Signed-off-by: Alexander Schmitz <Flashbang007@gmail.com>
 2021-01-27 11:00:43 +01:00
mtzfederico
e5bfafefb9 Moved where external.conf is included 
Signed-off-by: mtzfederico <fm@mtzfederico.com>
 2021-01-22 15:53:40 -06:00
freddii
7c0c30fb0b fixed typos 2021-01-19 19:33:38 +01:00
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>
 2021-01-11 17:05:17 +01:00
DL6ER
1791fe22f6
Merge pull request #3912 from mdujava/basic_auth 
Fix validation of adlist url
 2020-12-31 12:19:32 +01:00
DL6ER
e033ee6664
Fix connection mechanism between Chronometer and FTL 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-29 10:29:02 +01:00
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>
 2020-12-28 08:08:49 +01:00
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)
 2020-12-21 12:50:02 +01:00
Adam Warner
87cf9add8c
Merge pull request #3934 from mwoolweaver/patch-1 
Fix typo found by #3933
 2020-12-20 15:31:02 +00:00
Michael Woolweaver
3a05ac27a2
Fix typo found by #3933 
Signed-off-by: Michael Woolweaver <m.woolweaver@icloud.com>
 2020-12-19 17:37:17 -06:00
DL6ER
41479524f8
Merge pull request #3900 from ganto/fix/chrono-non-lte 
Fix chronometer output if web interface is not installed
 2020-12-12 10:08:05 +01:00
Adam Warner
357b6702ec
Update advanced/Scripts/chronometer.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-11 12:30:52 +00: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
Reto Gantenbein
e841347057 Fix chronometer output if web interface is not installed 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 02:55:55 +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
DL6ER
a217c75134
Merge pull request #3882 from pi-hole/tweak/conditional_transforms 
Fix processing of CONDITIONAL_FORWARDING_REVERSE
 2020-12-01 18:46:54 +01:00
Adam Warner
454c9a411c
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:36 +00:00
Adam Warner
f44b2f6aa3
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:21 +00:00
DL6ER
49810262db
When there is a Pi-hole domain set and "Never forward non-FQDNs" is ticked, we add to tell FTL that this domain is purely local and FTL may answer queries from /etc/hosts or DHCP but should never forward queries on that domain to any upstream servers 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-01 09:16:50 +01:00
Adam Warner
58bc98ca44
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 22:30:59 +00:00
Adam Warner
4093959d3e
Appease stickler 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:55:07 +00:00
Adam Warner
06c5fe2a89
Set REV_SERVER_CIDR in the else condition if it is not in-addr.arpa 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:29:54 +00:00
Adam Warner
6cb8f3f403
Add some comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:18:25 +00:00
Adam Warner
e004d27b28
Fix processing of CONDITIONAL_FORWARDING_REVERSE 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 18:58:23 +00:00
DL6ER
0711f4d63a
Revert "Enable DNS forwarding loop detection" 2020-11-28 18:29:32 +01:00