1
0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-08 07:00:59 +00:00
Commit Graph

6518 Commits

Author SHA1 Message Date
DL6ER
fab1ca3a40
Merge branch 'development' into tweak/gravity_backup 2025-01-01 18:46:33 +01:00
Dominik
b0e0bdc436
Disable lighttpd if found (#5835) 2024-12-30 17:01:04 +01:00
DL6ER
1835827371
Ensure Yes to keeping lighttpd doesn't trigger set -e during the upgrade
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-30 15:35:41 +01:00
Adam Warner
cb32a7f81c
Merge branch 'master' into development 2024-12-29 14:06:24 +00:00
Adam Warner
2cf046d559
Fix v5 for Fedora 41 (#5839) 2024-12-29 13:53:35 +00:00
Adam Warner
a1ccee6694
use rpm -q to check if packages are already installed, this is due to a change in the behaviour of dnf in Fedora 41
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-12-29 13:32:07 +00:00
Adam Warner
dff0c0105d
remove EOL OS from test suite
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-12-29 12:43:08 +00:00
Adam Warner
d972ffa53a
while v6 is still not released, update tests in master to NOT use development branch of FTL
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-12-29 12:35:32 +00:00
Adam Warner
22b6dc7dae
Add test scripts for fed 41 for v5
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-12-29 12:23:37 +00:00
Dominik
3406915917
Exit early when neither service nor systemctl commands are available (#5834) 2024-12-26 07:19:22 +01:00
Dominik
50645c2924
Apply suggestions from code review
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Dominik <DL6ER@users.noreply.github.com>
2024-12-24 02:19:37 +01:00
DL6ER
47d5a08565
Ask the user if they want to disable lighttpd
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-23 19:12:47 +01:00
DL6ER
e08f65d1c4
Disable lighttpd if found
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-23 09:30:37 +01:00
yubiuser
b964657b62
Speedup api response handling (#5833) 2024-12-23 09:14:47 +01:00
DL6ER
a2a22c4e13
Exit early when neither service nor systemctl commands are available
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-23 09:13:34 +01:00
Dominik
a9948304db
Fix v5 -> v6 update (#5832) 2024-12-23 08:54:26 +01:00
Christian König
3011d48b6f
Use tail instead of parameter expansion
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-22 23:44:31 +01:00
Christian König
c777152c04
Only separat data and status when needed
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-22 21:57:47 +01:00
Christian König
92a3c73f80
Fix v5 -> v6 update
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-22 21:46:32 +01:00
yubiuser
d80259ee8f
Improve dependency package output (#5828) 2024-12-16 17:22:12 +01:00
Christian König
83224e7729
Improve dependency package output
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 15:55:34 +01:00
yubiuser
6cca30ca45
Improve v6 user output (#5829) 2024-12-16 14:06:33 +01:00
Christian König
b2a5564685
FTL allows non-numieric port notation - we need to strip this
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 13:06:25 +01:00
Christian König
7dc542f3c2
Get WEBPORT from pihole.toml
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 12:54:39 +01:00
Christian König
3ac426b5d1
Update manpage
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 12:42:07 +01:00
Christian König
4d55bc1ae3
pihole -a is gone
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 12:08:16 +01:00
Christian König
26ef0be9d6
One check less
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 11:56:04 +01:00
yubiuser
d030492664
Fix rare case when apt and rpm package managers are found (#5827) 2024-12-15 07:19:53 +01:00
Christian König
cc01c110f1
Also check during installlation of the dependency package
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-14 22:31:02 +01:00
Christian König
fdda40994b
Fix rare case when apt and rpm package managers are found
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-14 22:26:05 +01:00
Dominik
4dbf9a0bbb
Install dependencies by creating a meta package on-the-fly (#5785) 2024-12-14 08:33:15 +01:00
Adam Warner
eb4b6ecf25
Remove no-longer-needed utils (#5826) 2024-12-11 17:36:21 +00:00
Christian König
c380c23592
Merge branch 'development' into packages 2024-12-11 18:34:34 +01:00
yubiuser
a41426474e
move the sourcing of utils.sh outside of installPihole (#5825) 2024-12-11 18:32:16 +01:00
Adam Warner
764aa48c14
Remove no-longer-needed utils
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-12-11 17:22:49 +00:00
Adam Warner
8f1fce8f4b
move the sourcing of utils.sh outside of installPihole
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-12-10 19:01:58 +00:00
Dominik
76a6b42075
Fix ARP flush command (#5823) 2024-12-07 13:37:34 +01:00
yubiuser
5c6b286a62
Bump pytest from 8.3.3 to 8.3.4 in /test (#5824) 2024-12-07 11:24:06 +01:00
DL6ER
11e00e04b5
Fix ARP flush command
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-07 11:22:58 +01:00
dependabot[bot]
5ef4a5e8b0
Bump pytest from 8.3.3 to 8.3.4 in /test
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.3 to 8.3.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.3.3...8.3.4)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-07 10:09:54 +00:00
Dan Schaper
03932e8ca7
Remove Ubuntu 23 tests, it is EOL (#5822) 2024-11-26 13:31:46 -08:00
DL6ER
579dc07046
Merge branch 'development' into tweak/gravity_backup
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-11-26 21:08:09 +01:00
DL6ER
b23348916b
Remove Ubuntu 23 tests, it is EOL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-11-26 21:07:11 +01:00
Dominik
7d727555e2
Fix empty adlists (#5821) 2024-11-26 20:09:41 +01:00
DL6ER
1c4a48258f
Only set ownership/permissions once the file was created
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-11-26 18:16:15 +01:00
DL6ER
d9288b896e
Do not touch list files as this creates them. This causes issues down the line in the Heisenberg compensator
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-11-26 18:01:52 +01:00
Dominik
553c0f7f07
Fix possible gravity permissions issue (#5819) 2024-11-25 17:51:45 +01:00
DL6ER
531490397d
When new domains are added to gravity and users run the first time gravity in the terminal (not via web), the list.123.abc.com file is created as root and stays like that. This causes issues down the line when users later try to run gravity from the web interface where we do not have root capabilities. This commit checks for write permissions and suggests what to do on error. It always ensures ownership and permissions are correct
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-11-25 12:40:55 +01:00
DL6ER
633c971a44
Store failed gravity restoration status in message table
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-11-23 09:44:39 +01:00
Dominik
6b423f534c
Remove remaining traces of audit log (#5817) 2024-11-17 21:25:22 +01:00