5855 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Yang Bin	2ade05d60f	Fixed wrong words in README.md ... Signed-off-by: Yang Bin <y0ngb1n@163.com>	2022-03-17 18:58:37 +08: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
yubiuser	ff5e788889	Merge pull request #4652 from rdwebdesign/debuglog_improvements ... Improving debug log	2022-03-16 07:00:59 +01: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
Adam Warner	36ca858668	Merge pull request #4641 from pi-hole/master ... sync: master to development	2022-03-05 15:57:30 +00:00
Adam Warner	899cac0aac	Ignore Documentation Needed label	2022-03-05 15:49:54 +00:00
Adam Warner	16b732fe8a	Merge pull request #4629 from pi-hole/tweak/api_port ... Tweak/api port	2022-03-05 15:47:35 +00:00
DL6ER	1bf2f8d0b7	Merge pull request #4635 from pi-hole/procps ... Add procps to dependencies	2022-03-01 21:11:04 +01:00
Christian König	c756bcb9d1	Add procps to dependencies ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-03-01 09:07:51 +01: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
Adam Warner	bd956b5f16	Merge pull request #4625 from pi-hole/master ... sync: master to development	2022-02-20 12:42:21 +00:00
Adam Warner	9be5199f7c	remove the CONTENT_COMPARISON setting (defaults to false)	2022-02-20 12:39:58 +00:00
yubiuser	9db19c5e96	Merge pull request #4621 from pi-hole/new/set_rate_limit ... Add backend option to set rate-limit from the dashboard	2022-02-19 21:19:57 +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
Adam Warner	0b905c28c1	Merge pull request #4609 from pi-hole/fix/flush ... Fix log flush with new query database schema	2022-02-13 00:38:28 +00: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	6ffa2ba1b2	Merge pull request #4547 from pi-hole/development ... Pi-hole Core v5.9	2022-02-12 20:04:20 +00:00
Adam Warner	e9250d62c5	Merge pull request #4598 from pi-hole/alt-4597 ... Use case insensitive deletion when removing custom CNAME/DNS records	2022-02-04 21:26:33 +00: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
Adam Warner	f342b2c9f6	Merge pull request #4489 from pi-hole/tweak/manpages ... Remove pihole-FTL.conf manpage	2022-02-04 20:36:32 +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
yubiuser	c3c5342b48	Fix reviewer's comment ... Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>	2022-02-04 21:11:54 +01:00
Christian König	d7d8e9730b	Remove pihole-FTL.conf.5 from automated tests ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-02-04 20:43:47 +01:00
Christian König	7c60ee8df1	Remove pihole-FTL.conf man page ... Signed-off-by: Christian König <ckoenig@posteo.de> Remove double https:// Signed-off-by: Christian König <ckoenig@posteo.de>	2022-02-04 20:43:47 +01:00
Adam Warner	ee9f4856a2	Merge pull request #4596 from pi-hole/long-live-centos8-stream ... Switch from centos8 to centos8:stream base image for centos 8 tests	2022-02-03 19:05:16 +00:00
Adam Warner	444526ad58	Switch from centos8 to centos8:stream base image for centos 8 tests	2022-02-03 18:43:19 +00: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
DL6ER	d956498c8c	Merge pull request #4575 from pi-hole/fix/tag_update ... Fix updating based on tags on older git versions by doing a full fetch	2022-02-01 07:44:23 +01:00
DL6ER	e09dd56807	Remove RPM package sqlite as well ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-02-01 07:38:57 +01:00
DL6ER	30ec1c94cc	Merge pull request #4593 from pi-hole/master ... sync: master to development	2022-02-01 07:37:47 +01:00
Adam Warner	5d68dac90e	Merge pull request #4588 from pi-hole/stale ... Fix stale label to stale	2022-01-31 19:25:28 +00: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
Christian König	2f4c4d9176	Fix stale label to stale ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-01-30 20:13:10 +01:00
Adam Warner	1dd9d55d82	Replace value for BLOCKING_ENABLED (and QUERY_LOGGING, for consistency) and if value that we are trying to replace does not exist, add it to the end of the file. ... Co-authored-by: MichaIng <micha@dietpi.com> Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-01-30 15:53:03 +00: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
DL6ER	534f9a63bf	Copy database tables earlier into the new gravity database to avoid foreign key contraint violations when adding gravity entries refering to an empty adlist table ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-30 10:36:20 +01:00
DL6ER	f0f5cc52d9	Use internal SQLite3 engine in more places in gravity.sh ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-29 22:39:45 +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
Adam Warner	e80a7731c9	Merge pull request #4568 from pi-hole/master ... sync: master to development	2022-01-16 16:26:50 +00:00