1994 Commits (development-v6)

Author	SHA1	Message	Date
Adam Warner	997a771dc8	Fix Deepsource.io warning message for index.php file (#4953)	2 years ago
Adam Warner	b7b5ffa8dd	remove old code per review from @yubiuser and @dschaper ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	34b66002e9	`leasetime` (local) should have an `h` after it to signify 24h lease, else it will be read as two minutes (minimum integer value) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
RD WebDesign	d48c557134	Fix Deepsource warning message for index.php file ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
Christian König	276c480f50	Return default port if non-numeric characters are set in pihole-FTL.conf for FTLPORT. FTL does the same in such case and provide the API on 4711 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	25ba68104b	Remove last traces ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	3d01e4d0cf	No detour - use pihole-FTL.conf to get the API port number ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Dan Schaper	f8a12917e2	Handle more than one default gateway in debug script (#4934)	2 years ago
Dan Schaper	37b45d411d	Read docker tag from file in root, not the previously set environment variable (#4929)	2 years ago
Christian König	22ebf21487	Use POSIX ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	9debd22179	If, after reading /pihole.docker.tag into DOCKER_TAG, it does not match an expected pattern, unset it - this should prevent arbitary code from being run ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Peter Russell	951b4ed002	Remove cronjob that checks local versions every 10 minutes - only check when required (#4939) ... * eliminate updatechecker local from pihole cron job Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * resolving stickler-ci items Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * undo changes to updatecheck.sh (request from PromoFaux) Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * applied recommendation from PromoFaux Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * Indent the code inside the function Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * removed unnecessary updatecheck for core Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * eliminate updatechecker local from pihole cron job Co-authored-by: jpgpi250 <jpgpi250@gmail.com> Signed-off-by: Adam Warner <me@adamwarner.co.uk> Signed-off-by: jpgpi250 <jpgpi250@gmail.com> Signed-off-by: Adam Warner <me@adamwarner.co.uk> Co-authored-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	1c1407e083	Use utils.sh in install script (#4872)	2 years ago
Adam Warner	9463c3c69f	Change wording in chronometer (#4910)	2 years ago
Christian König	bb57a9e616	Handle more than one default gateway in debug script ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	b6d1bd7335	Read docker tag from file in root, not the previously set environment variable ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Christian König	60c35cb93c	Remove unused check_database_integrity() ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	2c3fea321b	Remove FAQ_ULA as it is unused in `core` ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	40f00c6f0b	Fix gravity database integrity check ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	00e51f32b5	Blcked => Block ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	f90fb8b946	Change wording in chronometer ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	2ff1fa1b85	Merge branch 'development' into use_utils	2 years ago
Christian König	7e6f81f814	Add comment in lighttpd.conf how to change the server port ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
RD WebDesign	5cc317de5b	Change texts after Block Page removal ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
Adam Warner	3d53bda121	Update advanced/Scripts/updatecheck.sh ... Co-authored-by: yubiuser <ckoenig@posteo.de> Signed-off-by: Adam Warner <github@adamwarner.co.uk>	2 years ago
Adam Warner	760325eb76	Update piholeDebug to source versions file for DOCKER_VERSION instead of reading PIHOLE_DOCKER_TAG ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	bf256aa5a7	If docker version env var is set, store it in /etc/pihole/versions file for later use ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Christian König	49b9dc8888	Remove json_extract function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	9b5ea13a33	Use utils.sh in install script ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	66eeee5548	Remove the email function (#4870) ... - **What does this PR aim to accomplish?:** We offered to set an administrator email which was shown on the blockpage. With the removal of the blockpage (https://github.com/pi-hole/pi-hole/pull/3910) this function is not needed anymore. Corresponding web interface PR: https://github.com/pi-hole/AdminLTE/pull/2301	2 years ago
Adam Warner	a4b899c256	Review suggestions (and shellcheck complaints) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	5421aad03e	Store versions as key/value pairs rather than space delimeted values ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Christian König	eeccfb27f8	Remove it also from index.php together with more unused variables ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	4cf3280500	Merge pull request #4862 from pi-hole/tweak/lighttpd_headers ... Add security-related headers to Pi-hole web interface	2 years ago
Christian König	8c4a9aa6e3	Remove the email function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	114f562758	Merge branch 'development' into removeblockpagefunctionality	2 years ago
Adam Warner	e35a9da921	Remove the blockpage-focussed customisations to query.sh ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
yubiuser	c67f313ee8	Apply reviewers suggestion for inline CSS ... Co-authored-by: RD WebDesign <github@rdwebdesign.com.br> Signed-off-by: yubiuser <ckoenig@posteo.de>	2 years ago
Christian König	49a9f6f2db	Reproduce blockpage.css for $splashPage ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	e6683803ed	Use absolut asset paths ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	b98e331375	Only do one curl call in debug when checking the X-Header ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	6c9bd7a632	Remove blockingpage.css ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	5d5a85b7b6	X-Pi-hole removed from blocking page... ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	c78cf82fc6	no need to declare $viewPort ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Christian König	d77677312c	Extend FTL information in debug log ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
DL6ER	f418481b9f	Add security-related headers to Pi-hole web interface ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2 years ago
Dan Schaper	989c52ef24	Exit with return code if ftl does not start ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2 years ago
Christian König	3327df8d9c	Ensure user defined FTL_PID_FILE and FTL_PORT_FILE dirs are created on startup ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	0b81dd387b	type -> list_type per @yubiuser suggestion ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
yubiuser	aa0a9e2976	Merge pull request #4839 from pi-hole/move_getFTLPIDFile ... Move FTL port and PID functions to utils.sh	2 years ago
Christian König	567a915336	Remove unused and outdated files and scripts ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	7b77d991df	Move FTL port and PID functions to utils.sh ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
RD WebDesign	d89720330f	Address revision requests: ... - replace `local var` with `_var` (POSIX style); - move inline comments Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
RD WebDesign	8d1f286f30	Only execute spinner function if there is a tty ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
RD WebDesign	cbcd12631d	Adding the spinner for foreign_key_check too ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
RD WebDesign	c4f9a475f3	Debug log - add spinner for long processes ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
Christian König	b486786041	Add database healthy checks to debug script ... Fix health check output comparison in gravity script as well Add note about waiting time Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	8e4adb6e39	Merge pull request #4788 from pi-hole/SKIP_INSTALL ... Rename PH_TEST to SKIP_INSTALL	2 years ago
Christian König	b49db58ec2	Fix spelling mistakes ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	518cbd10e0	Rename also in docker files ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	0a8761ee68	Rename PH_TEST to SKIP_INSTALL ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	469776afd6	Do not restrict RegEx added from CLI by length ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
DL6ER	98c238064e	Change FTL's default log file path from /var/log/pihole/pihole-FTL.log to /var/log/pihole/FTL.log ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2 years ago
Adam Warner	0be987239e	Adds spellcheck action to the smoke-tests (also moves editorconfig-checker to smoketests away from it's own action) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Christian König	73d5902bed	Add editorconfig-checker workflow ... Add yml style to editorconfig Add markdown styling to editorconfig Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Dan Schaper	dcea3cf2c6	Merge branch 'development' into drop_fedora	2 years ago
Christian König	f9d1893f96	Update test to reflect currently supported OS ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	954a0c2a14	Remove read permission for others on senible log files ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Dan Schaper	67f5f16f84	Merge branch 'development' into fix-ipv6	2 years ago
yubiuser	ae9d16baf2	Merge pull request #3732 from pi-hole/tweak/moveloglocation ... Utilise /var/log/pihole/ for log storage	2 years ago
Christian König	300c7b1518	Do not hardcode webroot dir for teleporter ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	dae96e7384	Change lighttpd log file names ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	3fa8f76d99	Combine mkdir in service file ... Co-authored-by: MichaIng <micha@dietpi.com>	2 years ago
Christian König	52c3df1a8e	lighttpd log dir is now different than Pi-hole log dir ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	ce8731b746	no-dereference ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	08faf21b2e	Set file owner and permission to symlinks ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	2dd08f070e	Fix copy&paste error ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	0961103933	Add backward compatibility to FTL service by creating symlinks ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	82695aba7d	update LOG_DIRECTORY variable in debug script ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	36dd533ef3	use directory /var/log/pihole/ for log storage ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
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>	2 years ago
Omoeba	f7c800863e	Remove DHCPv6, use leasetime from interface (#4507) ... Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>	2 years ago
Adam Warner	d78c689e55	no more alphabetical order ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	c9e76c978e	Update advanced/Scripts/webpage.sh ... Co-authored-by: yubiuser <ckoenig@posteo.de>	2 years ago
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>	2 years ago
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>	2 years ago
Adam Warner	86dd612882	remove `readonly` directive from declaration of `utilsfile`, it is unnecassery ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
yubiuser	d3e94cbceb	Merge pull request #4653 from pi-hole/refactor-utils-redux ... Tweaks to functions in utils.sh and refactored usages in webpage.sh	2 years ago
yubiuser	9b4f6c84cd	Minor review comments	2 years ago
Adam Warner	4d31d5ee11	Address review comments ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Christian König	e4a1f3a175	Rename block lists to adlists within the query list functions ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	0d74b27101	Merge pull request #4646 from pi-hole/tweak/debug_message ... Pool identical messages in debug output	2 years ago
Adam Warner	7fa8cdd03e	Address: ... - Review Comments - Stickler Complaints	2 years ago
Adam Warner	fe9031b26f	Merge pull request #4669 from pi-hole/master ... sync: master to development	2 years ago
Dan Schaper	b714c4598a	Found it. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2 years ago
Dan Schaper	0f192998eb	Create empty files. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2 years ago
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>	2 years ago
RD WebDesign	5cebceadda	Remove `@` and following character from interface name ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
RD WebDesign	f8e84b3c3f	Fix stickler ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
RD WebDesign	c9809371ab	Selecting the protocol ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
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>	2 years ago
Adam Warner	59fc3804be	Make utils.sh posix compatible per request ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
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>	2 years ago
RD WebDesign	ab7d83384f	Allow lighttpd to stream responses to browser ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
Christian König	48136c5bbc	Add last timestamp ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	0219e5dfe0	Pool identical messages in debug output ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	0631cb4984	Merge pull request #4645 from rdwebdesign/color_debug_web ... Generate colorful debug logs to web interface	2 years ago
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>	2 years ago
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>	2 years ago
DL6ER	91b4233d3a	Add backend option to set rate-limit from the dashboard ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2 years ago
Christian König	f4286a4d12	Fix log flush with new query database schema ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
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>	2 years ago
Adam Warner	2bd670a3dd	Merge pull request #4582 from lschloetterer/patch-1 ... add parameter to set filename for teleporter	2 years ago
Lukas Schlötterer	2a0bb5b9ee	Create second entry for teleporter and adjust spacing ... Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>	2 years ago
DL6ER	844c4dcdc8	Merge pull request #4584 from pi-hole/fix/gravity_internal_sqlite3 ... Replace calls to sqlite3 by calls to pihole-FTL sqlite3	2 years ago
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>	2 years ago
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	2 years ago
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>	2 years ago
DL6ER	74d7d10554	Orphans need to be deleted in the old database ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2 years ago
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>	2 years ago
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>	2 years ago
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>	2 years ago
Christian König	7aa28e4a3a	Do a full fetch ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
RD WebDesign	6ead24b315	Move space into variable (#4562) ... Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>	2 years ago
DL6ER	ec3a5c2989	Merge pull request #4543 from pi-hole/tweak/debug_ipaddr ... Include ip addr show and ip route show in debug log	2 years ago
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>	2 years ago
Christian König	a65a841c56	Remove oneline from ss call ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
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>	2 years ago
Christian König	81698ef1ed	Fix Pi-hole status in chronometer ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
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>	2 years ago
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	c6a2a6f739	Install pihole-FTL.conf template on fresh installation (#4496) ... Signed-off-by: Christian König <ckoenig@posteo.de>	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	3a67d1cf8d	Merge pull request #4461 from pi-hole/qr_iframe ... Companion to pi-hole/adminlte #1996	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	28085cf7d8	Merge iFrame exceptions ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	2eff53b2bb	Allow qr code iframe ... Signed-off-by: Christian König <ckoenig@posteo.de>	3 years ago
Christian König	8d6ce78c65	Allow qr code iframe ... Signed-off-by: Christian König <ckoenig@posteo.de>	3 years ago
Christian König	b52a3a021d	Add comment help text to list function ... Signed-off-by: Christian König <ckoenig@posteo.de>	3 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>	3 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
David Irvine	c6da1a3918	Fix documentation; add some missing zones ... Signed-off-by: David Irvine <aviddiviner@gmail.com>	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
DL6ER	19ae9d3ee6	Merge pull request #4375 from pi-hole/companion/adminlte-1231 ... Companion to pi-hole/adminlte #1231	3 years ago
DL6ER	d03aa0c0c7	Merge pull request #4379 from pi-hole/tweak/vw_adlist ... Simplify vw_adlist	3 years ago
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>	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
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>	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
DL6ER	b755330f4c	Remove local-ttl from set of default dnsmasq options. ... Signed-off-by: DL6ER <dl6er@dl6er.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
Adam Warner	62f29ba3fa	Merge branch 'release/v5.4' into development	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
Adam Warner	89e187947e	Merge pull request #4282 from pi-hole/new/RFC6761 ... Install RFC6761 config file	3 years ago
Adam Warner	d2faa93241	Merge pull request #4314 from pi-hole/fix/capabilities ... Add possibly missing capabilities	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	482ac12c9b	Merge pull request #4275 from MichaIng/patch-4 ... Remove ineffective Access-Control-Allow-Origin header	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
DL6ER	a1ee7d92a9	Add possibly missing capabilities ... 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
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>	3 years ago
DL6ER	ea5a3bf0b2	Install RFC6761 config file ... Signed-off-by: DL6ER <dl6er@dl6er.de>	3 years ago
Adam Warner	c88c943cda	Merge branch 'release/v5.4' into dev-release5.4 ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	3 years ago
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>	3 years ago
Christian König	676b7e60f3	Fix Splashpage not appearing properly on non-root directories ... Signed-off-by: Christian König <ckoenig@posteo.de>	3 years ago
DL6ER	43b88cd628	Merge pull request #4236 from MichaIng/patch-4 ... Update pihole-FTL.service	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
Adam Warner	913dcead7f	move chmod/chown of macvendor.db to pihole-FTL.service ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	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
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>	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
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	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
Adam Warner	c9e341b5d4	Same change as with #4221, but on fedora config too ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	3 years ago
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>	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
Dan Schaper	9b57f7fa33	Merge pull request #4120 from pi-hole/fix/splashPage ... Add missing closing single quote	3 years ago
Dan Schaper	866045968d	Add missing closing single quote ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	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	ea451e3c22	Merge pull request #4095 from jbaez/ft-3896 ... Fix error trying to access undefined variables on splash page.	3 years ago
Jaime Baez	6198165df8	Fix error trying to access undefined variables on splash page. ... Signed-off-by: Jaime Baez <j.baezcastillo@gmail.com>	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
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>	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
Adam Warner	56fa9714b5	Merge pull request #4010 from mtzfederico/master ... Updates lighttpd config to allow a persistent port change on IPv6	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
mtzfederico	e5bfafefb9	Moved where external.conf is included ... Signed-off-by: mtzfederico <fm@mtzfederico.com>	3 years ago
freddii	7c0c30fb0b	fixed typos	3 years ago