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
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
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
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
9b4f6c84cd
Minor review comments
2022-04-04 23:14:10 +02:00
4d31d5ee11
Address review comments
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-04-04 22:02:26 +01:00
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
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
7fa8cdd03e
Address:
...
- Review Comments
- Stickler Complaints
2022-04-02 12:46:07 +01:00
fe9031b26f
Merge pull request #4669 from pi-hole/master
...
sync: master to development
2022-04-02 00:05:49 +01:00
b714c4598a
Found it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2022-04-01 14:49:30 -07:00
0f192998eb
Create empty files.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2022-04-01 14:17:57 -07:00
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
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
f8e84b3c3f
Fix stickler
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2022-03-23 18:45:18 -03:00
c9809371ab
Selecting the protocol
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2022-03-23 18:33:15 -03:00
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
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
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
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
48136c5bbc
Add last timestamp
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-03-14 19:54:46 +01:00
0219e5dfe0
Pool identical messages in debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-03-12 21:00:48 +01:00
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
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
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
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
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
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
2bd670a3dd
Merge pull request #4582 from lschloetterer/patch-1
...
add parameter to set filename for teleporter
2022-02-04 20:44:49 +00:00
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
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
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
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
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
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
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
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
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
7aa28e4a3a
Do a full fetch
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-22 22:09:15 +01:00
6ead24b315
Move space into variable ( #4562 )
...
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br >
2022-01-14 17:00:34 +01:00
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
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
a65a841c56
Remove oneline from ss call
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-09 07:13:51 +01:00
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
81698ef1ed
Fix Pi-hole status in chronometer
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-05 21:09:57 +01:00
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
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
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
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
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
