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
Adam Warner
a3516474e8
Merge pull request #4859 from pi-hole/dependabot/github_actions/development/actions-ecosystem/action-add-labels-1.1.3
...
Bump actions-ecosystem/action-add-labels from 1.1.0 to 1.1.3
2022-08-06 11:23:15 +01:00
dependabot[bot]
9e2e0019fb
Bump actions-ecosystem/action-add-labels from 1.1.0 to 1.1.3
...
Bumps [actions-ecosystem/action-add-labels](https://github.com/actions-ecosystem/action-add-labels ) from 1.1.0 to 1.1.3.
- [Release notes](https://github.com/actions-ecosystem/action-add-labels/releases )
- [Commits](https://github.com/actions-ecosystem/action-add-labels/compare/v1.1.0...v1.1.3 )
---
updated-dependencies:
- dependency-name: actions-ecosystem/action-add-labels
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-08-06 10:22:39 +00:00
Adam Warner
aef3d89814
Merge pull request #4860 from pi-hole/dependabot/github_actions/development/actions/stale-5.1.1
...
Bump actions/stale from 5.1.0 to 5.1.1
2022-08-06 11:20:38 +01:00
Adam Warner
f2641fb0e5
Merge pull request #4861 from pi-hole/dependabot/github_actions/development/actions/setup-python-4.2.0
...
Bump actions/setup-python from 4.1.0 to 4.2.0
2022-08-06 11:20:21 +01:00
dependabot[bot]
e50438dc11
Bump actions/setup-python from 4.1.0 to 4.2.0
...
Bumps [actions/setup-python](https://github.com/actions/setup-python ) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/actions/setup-python/releases )
- [Commits](https://github.com/actions/setup-python/compare/v4.1.0...v4.2.0 )
---
updated-dependencies:
- dependency-name: actions/setup-python
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-08-06 10:07:31 +00:00
dependabot[bot]
6062df0923
Bump actions/stale from 5.1.0 to 5.1.1
...
Bumps [actions/stale](https://github.com/actions/stale ) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/actions/stale/releases )
- [Changelog](https://github.com/actions/stale/blob/v5.1.1/CHANGELOG.md )
- [Commits](https://github.com/actions/stale/compare/v5.1.0...v5.1.1 )
---
updated-dependencies:
- dependency-name: actions/stale
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-08-06 10:07:28 +00:00
Dan Schaper
989c52ef24
Exit with return code if ftl does not start
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-08-04 17:20:39 -07:00
yubiuser
4a589286b7
Merge pull request #4855 from pi-hole/fix/dir_not_exist
...
Ensure user defined FTL_PID_FILE and FTL_PORT_FILE dirs are created on startup
2022-08-04 22:27:08 +02:00
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>
2022-08-04 14:47:43 +02:00
yubiuser
3cdaad060b
Merge pull request #4851 from pi-hole/keywords
...
Dont use bash keywords/programs as variable names
2022-08-01 22:07:21 +02:00
Adam Warner
0b81dd387b
type -> list_type per @yubiuser suggestion
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-01 20:56:37 +01:00
Adam Warner
64dc002c3f
Same per @rdwebdesign suggestion.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-01 20:38:31 +01:00
Adam Warner
6c7a28a7b5
Dont use bash keywords/programs as variable names
2022-08-01 18:38:15 +01:00
Adam Warner
21158cb6bc
Merge pull request #4833 from pi-hole/workflow_versions
...
Explicit set minor and patch version on used actions
2022-08-01 17:20:05 +01:00
Adam Warner
71bc237639
Merge pull request #4828 from pi-hole/centos7-can-do-one
...
Drop explicit support for CentOS 7 from the install script
2022-07-31 19:15:41 +01:00
Adam Warner
c6da627b7d
Move release version check inside the else block
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-31 18:55:05 +01:00
Christian König
a3ac1caac6
Update actions to latest versions
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-31 09:46:51 +02:00
Christian König
8f3e6f1a50
CodeQl does not use .minor.patch version
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-31 09:46:50 +02:00
