5857 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Adam Warner	3d53bda121	Update advanced/Scripts/updatecheck.sh ... Co-authored-by: yubiuser <ckoenig@posteo.de> Signed-off-by: Adam Warner <github@adamwarner.co.uk>	2022-09-15 17:54:54 +01:00
Christian König	8bc5b16527	Set tox envlist to py3 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-15 13:55:45 +02:00
Christian König	c1a927fff1	Run test workflows on python 3.10 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-15 13:55:45 +02:00
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>	2022-09-14 22:49:37 +01:00
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>	2022-09-14 22:38:41 +01:00
Adam Warner	8dbe6fc0b7	master-> Dev (#4912)	2022-09-14 22:08:15 +01:00
Adam Warner	fe8b0e98ab	v5.12.1 (#4908)	2022-09-14 21:28:44 +01:00
yubiuser	ef45578af3	Fix 4898 (#4899)	2022-09-06 19:43:24 +02:00
Christian König	89b88416b3	Fix 4898 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-06 17:09:52 +02:00
Adam Warner	5d913ad192	Release 5.12 (#4889) (#4897)	2022-09-05 08:48:37 +01:00
yubiuser	711035fd8f	Update FTL Binary test to ensure we catch incompatibility issues early (#4893)	2022-09-03 14:44:16 +02:00
Adam Warner	0f74165c9d	Drop Ubuntu 18 tests ... Tweek version_check to only output 1st char of the reported version Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-09-03 12:55:17 +01:00
Adam Warner	46e1a87e9e	Tweak FTL test to ensure we don't get false positives on incompatible OS (Will remote Ub18 in a separate commit) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-09-03 12:09:37 +01:00
Adam Warner	f998eee467	Release 5.12 (#4889)	2022-09-02 18:39:03 +01:00
Christian König	230d6a435f	Semi hardcode the connection_timeout value ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-31 21:41:57 +02:00
Christian König	53c0982c8b	Set connection timeout for curl ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-31 14:43:20 +02:00
yubiuser	d6cfa57ef3	Add jq as dependency and remove json_extract (#4878) ... **What does this PR aim to accomplish?:** Adds `jq` as dependency and removes the now obsolete `json_extract` function. `jq` is a small dependency and adds powerfull json abilities. With `FTL v6` we will have a whole new json-based API where `jq` might be needed anyway. Also for `PADD` to interact with `FTL v6`, `jq` will be a requirement: https://github.com/pi-hole/PADD/pull/247 --- **By submitting this pull request, I confirm the following:** 1. I have read and understood the [contributors guide](https://docs.pi-hole.net/guides/github/contributing/), as well as this entire template. I understand which branch to base my commits and Pull Requests against. 2. I have commented my proposed changes within the code and I have tested my changes. 3. I am willing to help maintain this change if there are issues with it later. 4. It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1) 5. I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)) --- - [x] I have read the above and my PR is ready for review. _Check this box to confirm_	2022-08-26 10:09:42 +02:00
Christian König	49b9dc8888	Remove json_extract function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-25 09:55:47 +02:00
Christian König	1335c44deb	Add jq to dependencies ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-25 09:55:42 +02:00
Christian König	9b5ea13a33	Use utils.sh in install script ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-24 08:49:20 +02:00
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	2022-08-24 07:21:04 +02:00
Adam Warner	597c045f9e	Merge pull request #4875 from pi-hole/tweak/version-file ... Store versions as key/value pairs rather than space delimeted values	2022-08-23 19:23:44 +01:00
Adam Warner	a4b899c256	Review suggestions (and shellcheck complaints) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-23 19:10:12 +01:00
Adam Warner	5421aad03e	Store versions as key/value pairs rather than space delimeted values ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-22 19:11:27 +01:00
Christian König	eeccfb27f8	Remove it also from index.php together with more unused variables ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-20 23:07:38 +02:00
yubiuser	4cf3280500	Merge pull request #4862 from pi-hole/tweak/lighttpd_headers ... Add security-related headers to Pi-hole web interface	2022-08-18 13:37:28 +02:00
Christian König	8c4a9aa6e3	Remove the email function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-17 23:14:56 +02:00
Adam Warner	9ab566884d	Merge pull request #3910 from pi-hole/removeblockpagefunctionality ... Remove the advanced functionality of the 404 page (Blockpage)	2022-08-17 21:22:01 +01:00
yubiuser	37102e5a01	Merge branch 'development' into removeblockpagefunctionality	2022-08-17 21:29:58 +02:00
yubiuser	5a98fa1f76	Merge pull request #4843 from MichaIng/patch-1 ... Skip web server dialog if --disable-install-webserver has been passed	2022-08-17 21:27:59 +02:00
Adam Warner	114f562758	Merge branch 'development' into removeblockpagefunctionality	2022-08-17 20:25:03 +01:00
MichaIng	b3c8045b52	Skip web server dialog if --disable-install-webserver has been passed ... Prior to https://github.com/pi-hole/pi-hole/pull/4772, the web server dialog was skipped if --disable-install-webserver was passed (INSTALL_WEB_SERVER=false). This commit restores this behaviour. Signed-off-by: MichaIng <micha@dietpi.com>	2022-08-17 20:48:11 +02:00
yubiuser	a0419bc1f0	Merge pull request #4864 from pi-hole/debug_FTL_branch ... Extend FTL information in debug log	2022-08-08 21:25:56 +02:00
Adam Warner	e35a9da921	Remove the blockpage-focussed customisations to query.sh ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-08 18:57:55 +01:00
Christian König	97447b2f3b	Do not remove blockingpage.css from existing installations as some users might use them for custom.php ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 18:20:49 +01:00
yubiuser	c67f313ee8	Apply reviewers suggestion for inline CSS ... Co-authored-by: RD WebDesign <github@rdwebdesign.com.br> Signed-off-by: yubiuser <ckoenig@posteo.de>	2022-08-08 17:21:29 +01:00
Christian König	49a9f6f2db	Reproduce blockpage.css for $splashPage ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 17:21:29 +01:00
Christian König	e6683803ed	Use absolut asset paths ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 17:21:29 +01:00
Christian König	27fa284eda	Fix missing PI_HOLE_BLOCKPAGE_DIR ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 17:21:29 +01:00
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>	2022-08-08 17:20:41 +01:00
Christian König	6c9bd7a632	Remove blockingpage.css ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 17:20:13 +01:00
Adam Warner	5816f495f4	Fix test_installPiholeWeb_fresh_install_no_errors and test_installPihole_fresh_install_readableBlockpage ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-08 17:12:16 +01:00
Adam Warner	5d5a85b7b6	X-Pi-hole removed from blocking page... ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-08 17:12:16 +01:00
Adam Warner	c78cf82fc6	no need to declare $viewPort ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-08 17:12:09 +01:00
Christian König	d77677312c	Extend FTL information in debug log ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 13:52:20 +02:00
yubiuser	d38fcb0549	Merge pull request #4863 from pi-hole/fix/git_indention ... Fix git indention	2022-08-07 20:25:42 +02:00
Christian König	c7410b0be9	Always indent ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-07 15:50:05 +02:00
Dan Schaper	20c561c83c	Merge pull request #4857 from pi-hole/4856-init-script-ftl ... Exit init script with error result code if FTL fails to start	2022-08-06 13:15:10 -07:00
Christian König	7320c10dd3	Fix git indention ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-06 21:44:19 +02:00
DL6ER	f418481b9f	Add security-related headers to Pi-hole web interface ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-08-06 15:35:01 +02:00