5169 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Christian König	2b52f92647	Inlcude port also in cli output ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-28 19:36:32 +01:00
Matthew Nickson	71ed842dfd	Fixed path to 404 file when using custom.php (#4488) ... Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-12-28 19:32:06 +01:00
Christian König	f45248df80	Use FTL's new dns-port API endpoint ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-28 13:42:19 +01:00
Christian König	5729f64ddc	Fix missing fi ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-28 12:21:31 +01:00
Christian König	2a869419b4	Add netcat to dependencies ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-28 12:18:39 +01:00
yubiuser	4a2f4c1bce	Fix indention_2 ... Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>	2021-12-28 12:11:46 +01:00
yubiuser	5ef731fc57	Fix indention ... Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>	2021-12-28 12:11:26 +01:00
Christian König	71ebd64f4e	mend ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-26 18:13:14 +01:00
Christian König	9f0e0dbd37	Fix analyse ports ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-26 18:10:36 +01:00
Christian König	ef30a85afb	Include port in status function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-26 17:10:48 +01:00
Adam Warner	1b809e4e8e	Merge pull request #4480 from pi-hole/development ... Pi-hole Core v5.7	2021-12-22 20:24:59 +00:00
DL6ER	3d3bb45a46	Merge pull request #4288 from pi-hole/new/gravity_repair ... Implement fully-automated gravity database recovery method	2021-12-22 21:08:01 +01:00
DL6ER	d2a98ae954	Document -r recover force case ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-12-22 19:53:52 +01:00
DL6ER	2e1ce7fc87	Apply suggestions from code review ... Co-authored-by: yubiuser <ckoenig@posteo.de>	2021-12-22 19:52:08 +01: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
DL6ER	54c58327f1	Merge pull request #4450 from pi-hole/unblock_NODATA ... Unblock adlist domain during gravity run in NODATA mode	2021-12-21 22:08:14 +01:00
yubiuser	db5e94b14a	use +short and omit obsolet awk ... Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>	2021-12-21 22:01:34 +01:00
DL6ER	7167e6d5e4	Apply suggestions from code review ... Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>	2021-12-21 16:20:02 +01:00
yubiuser	39a66b608b	Replace Contributing Guide by link to docs.pi-hole.net (#4433) ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-21 14:00:47 +01:00
DL6ER	b06efb6ab7	Declare variables local ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-12-21 14:00:46 +01:00
DL6ER	ab4bce4787	Allow users to force recovery even when checks are okay using "pihole -g -r recover force" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-12-21 13:57:03 +01:00
DL6ER	469c179b32	Return early from recovery routine when integrity checks didn't show any database errors. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-12-21 13:57:03 +01:00
DL6ER	190ab79606	Implement fully-automated gravity database recovery method. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-12-21 13:57:03 +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
DL6ER	ef0a22f9ec	Merge pull request #4478 from pi-hole/fix/db_permission ... Gravity database handling improvements	2021-12-20 21:28:09 +01:00
Dan Schaper	533a77d6d5	Add database function failure guards. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2021-12-20 11:36:55 -08:00
Dan Schaper	76ae75689c	Check for DNS before run. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2021-12-20 11:09:11 -08:00
Dan Schaper	a780fc59e2	Set DBFile permissions on creation. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2021-12-20 10:56:42 -08: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
Dan Schaper	a3cc5df317	Configure stale action (#4269) ... * Configure stale action * [skip ci] Update .github/workflows/stale.yml * Update .github/workflows/stale.yml	2021-12-16 20:19:11 +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
yubiuser	ae39e338fe	Use exec to run gravity script (#4449) ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-04 10:50:21 +01:00
Christian König	e243c562c2	Unblock adlist domain during gravity run in NODATA mode ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-03 09:17:19 +01:00
DL6ER	4c267f7732	Merge pull request #4445 from pi-hole/fix/counting ... Fix number of invalid domains	2021-12-03 08:56:54 +01:00
Christian König	647ba6ec9d	Rename variables to improve comprehensibility ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-02 23:13:01 +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
Chiller Dragon	e485a7b9bb	Some shellchecks in basic-install.sh (#4088) ... * Some shellchecks in basic-install.sh Signed-off-by: ChillerDragon <ChillerDragon@gmail.com> * Use more explicit grep (thanks to @MichaIng) Signed-off-by: ChillerDragon <ChillerDragon@gmail.com>	2021-12-02 14:44:50 +01:00
Christian König	bfda52ed79	Fix number of invalid domains ... Co-authored-by: abesnier <besnier_antoine@yahoo.fr> Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-01 11:07:17 +01:00
yubiuser	941f90d5c1	Merge pull request #4443 from MichaIng/patch-1 ... Fix generated /etc/os-release file in OS check test	2021-11-30 13:05:34 +01:00
MichaIng	14a379d448	Fix generated /etc/os-release file in OS check test ... Signed-off-by: MichaIng <micha@dietpi.com>	2021-11-30 02:57:44 +01:00
yubiuser	671fcaffc3	Merge pull request #4085 from jbzdarkid/patch-3 ... Clean up bash script formatting	2021-11-26 09:23:31 +01: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
yubiuser	b750b01acc	Merge pull request #4434 from MichaIng/patch-1 ... Use a fixed list height for network interface selection	2021-11-22 16:37:58 +01:00