1
0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-09-20 17:11:17 +08:00
Commit Graph

5807 Commits

Author SHA1 Message Date
001f2012a2 Update automated install/basic-install.sh
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-06-18 15:45:30 +01:00
c39cb8cfe0 Escape the sed command for removing a line in fed/centos lighttpd.conf
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-18 15:45:30 +01:00
d5013bfd6c Add code to remove old lighttpd config files left over from v5. Web config is all dealt with by FTL now
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-18 15:45:30 +01:00
5459daa03d Add abp_entries column (default 0) to the adlist table for newly created gravity databases. This updates the gravity database version to 16
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-15 09:36:17 +02:00
e0d7e5df85 Install binutils as installer deps (needed to pick correct architecture for FTL)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-09 19:30:28 +02:00
913be6c349 Print detected CPU arch
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-09 19:01:14 +02:00
1c4e58efe3 Use exact architecture matching binaries where appropriate
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-09 15:53:02 +02:00
9c27e4766d Decide which FTL architecture to pick by by installed architectures rather than by detected processor (this may be wrong in an emulated Docker environment)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-08 22:17:14 +02:00
7e95371fe8 Do not remove -all|exact when not surrounded by space in query.sh (#5300) 2023-06-04 22:16:35 +01:00
499998c537 Remove option to set static IP address if DHCPCD is installed (#5111) 2023-06-04 22:09:04 +01:00
8bf4ab0cd6 Remove option to set static IP address if DHCPCD is installed
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 22:59:44 +02:00
088b2c2920 Do not remove -all|excat when not sourrounded by space in query.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 22:57:31 +02:00
ba3e290915 Fix shellcheck errors
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 21:21:48 +02:00
53fb7ae0ef Use shellcheck in smoke-tests. RIP stickler
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 21:06:44 +02:00
366345e87e Fix no_installs
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 20:31:48 +02:00
667418c71d Use new FTL binary names
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-04 20:02:38 +02:00
ec82aec55f centos_common_support.py was removed
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-02 00:13:57 +02:00
7da57c6acd Don't check and install old FTL config file
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-02 00:08:50 +02:00
0becc7615a Run prestart
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 23:51:03 +02:00
a4322c624f Fix gravity in tests
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 22:00:40 +02:00
001024b4da Fix Tests No2
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 20:41:54 +02:00
792b0d419b Test fixes
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-01 19:29:47 +01:00
7351a4d3b1 Merge branch 'development' into development-v6
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 15:45:05 +02:00
f7b9d70054 Remove man page for pihole-FTL
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-30 21:39:10 +02:00
c1335c6852 Fix gravity adlist status not being updated (#5294) 2023-05-30 19:02:07 +02:00
6c302c9bc8 Adlist properties need to be stored in the new ("temp") database rather than the old.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-30 17:01:58 +02:00
fc67de8c19 Fix Faulty Regex pattern in custom DNS domain validation (#5291) 2023-05-29 09:13:33 +02:00
494734bf27 Add in a test case
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-28 23:48:16 +01:00
11679a5188 @MrDuck2742 dropped a ] on the floor without me seeing. I picked it up and put it back again
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-28 23:31:51 +01:00
aa9b4530c8 Sync master back into development (#5289) 2023-05-28 13:08:25 +01:00
bea63f9d2d Pi-hole v5.17 (#5288) v5.17 2023-05-28 12:01:25 +01:00
137e6dc184 Remove all the undocumented now useless stuff from pihole -a
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-28 09:01:02 +02:00
de5e6e4163 Add support for RISC-V 64-bit installs (#5196) 2023-05-28 07:44:06 +02:00
350c9e02ea Add Ubuntu 23 to test suite (#5284) 2023-05-28 07:39:34 +02:00
f59610081e remove outdated comments (#5227) 2023-05-27 22:41:11 +02:00
50d67dce73 Bump actions/setup-python from 4.6.0 to 4.6.1 (#5286) 2023-05-27 15:22:47 +02:00
43ba31f402 Bump pytest-testinfra from 8.0.0 to 8.1.0 in /test (#5287) 2023-05-27 14:45:28 +02:00
3ae72114c7 Bump pytest-testinfra from 8.0.0 to 8.1.0 in /test
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 8.0.0 to 8.1.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/8.0.0...8.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-27 10:59:32 +00:00
783f9e5569 Bump actions/setup-python from 4.6.0 to 4.6.1
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4.6.0...v4.6.1)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-27 10:56:41 +00:00
b5800ef718 Remove getFTLAPIPort() function and fix pihole status
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-27 11:53:00 +01:00
44bfb8ebf0 Remove the ability to reboot/shutdown via webpage.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-27 11:53:00 +01:00
ea748822ef REVISIT: I don't _think_ this line is nessacery. Why should gravity restart FTL if it is offline? It might be offline on purpose.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:53:00 +01:00
c0e352094d REVISIT: Remove some references to setupVars (some files can probably go entirely...)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
a91eb48d48 Remove some code from gravity that gets values from setupVars.conf / pihole-FTL.conf - use getFTLConfigValue from utils.sh instead
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
6b1c8a7fff @DL6ER changed the config key names...
Remove superfluous test

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
7cbe713873 REVISIT: Don't rely on existence of setupVars.conf
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
0e8f285f4f Always assume that the web interface will be installed.
We could revist this again in future if we decide that there should still be a choice to install the interface or not

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
cd17040f95 setupVars.conf not existing is no longer a critical error
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
2784b267ec pihole command: read values from pihole-FTL instead of setupvars.conf
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
dbc6b814b2 Should not need to reloadDNS manually any more as FTL will detect that it needs to reload by itself
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00