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

1465 Commits

Author SHA1 Message Date
4be130971e Update automated install/basic-install.sh
Co-authored-by: yubiuser <github@yubiuser.dev>
Signed-off-by: Dominik <DL6ER@users.noreply.github.com>
2025-01-09 18:32:04 +01:00
211a881888 Apply suggestions from code review
Co-authored-by: yubiuser <github@yubiuser.dev>
Signed-off-by: Dominik <DL6ER@users.noreply.github.com>
2025-01-08 19:28:15 +01:00
4d23187f86 Add missing newline
Signed-off-by: DL6ER <dl6er@dl6er.de>
2025-01-07 17:49:57 +01:00
b544b74f7a Merge branch 'development' into fix/migration 2025-01-06 16:43:18 +01:00
6e633e4cfd Improve lighttpd disabling (#5849) 2025-01-02 15:05:00 +01:00
364281354c Check if service is currently enabled when checking if lighttpd may need to be disabled
Signed-off-by: DL6ER <dl6er@dl6er.de>
2025-01-02 13:43:32 +01:00
79087fb252 SHow lighttpd disable dialog only once during v6 migration and when lighttpd is actually installed
Signed-off-by: DL6ER <dl6er@dl6er.de>
2025-01-01 18:55:49 +01:00
4fd77f57fa Remove now unused function test_dpkg_lock()
Signed-off-by: Christian König <github@yubiuser.dev>
2025-01-01 12:20:50 +01:00
b0e0bdc436 Disable lighttpd if found (#5835) 2024-12-30 17:01:04 +01:00
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
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
d14273f958 Add comment where setupVars.conf goes when v6 migration is done
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-24 02:17:50 +01:00
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
e08f65d1c4 Disable lighttpd if found
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-23 09:30:37 +01:00
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
8faa28d8a0 Explicitly log migration process
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-23 08:57:34 +01:00
92a3c73f80 Fix v5 -> v6 update
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-22 21:46:32 +01:00
4f268ed193 Explicitly migrate from v5 to v6
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-21 07:10:46 +01:00
d80259ee8f Improve dependency package output (#5828) 2024-12-16 17:22:12 +01:00
83224e7729 Improve dependency package output
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 15:55:34 +01:00
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
7dc542f3c2 Get WEBPORT from pihole.toml
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 12:54:39 +01:00
4d55bc1ae3 pihole -a is gone
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 12:08:16 +01:00
26ef0be9d6 One check less
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-16 11:56:04 +01:00
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
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
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
4137275f24 Merge branch 'development' into packages
Signed-off-by: Christian König <github@yubiuser.dev>
2024-11-17 21:13:16 +01:00
62b63f87e0 Use rpm instead of dnf to check for installed package. dnf changed to returning success even for not-installed packages wit Fedora 41
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-11-16 12:46:43 +01:00
9478e35cb7 Create a random temp direcotry to build the packages and remove leftovers
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: yubiuser <ckoenig@posteo.de>
2024-11-06 20:12:09 +01:00
cd7e5abe25 Add TRAP to the installer
Signed-off-by: Christian König <github@yubiuser.dev>
2024-11-06 20:12:09 +01:00
c47f8c2cd6 Overhaul uninstall script
Signed-off-by: Christian König <github@yubiuser.dev>
2024-11-06 20:12:09 +01:00
f08c54e166 Create dependency package on RPM distros
Signed-off-by: Christian König <github@yubiuser.dev>
2024-11-06 20:12:09 +01:00
fd5b3be03f Create meta package on the fly ... Debian
Signed-off-by: Christian König <github@yubiuser.dev>
2024-11-06 20:11:56 +01:00
112b961762 Fix errors on fresh installations while setting privacy levels and query logging due to absence of pihole.toml (#5799) 2024-10-28 18:04:46 +01:00
8bf6480aed Set exit code explicitly everywhere
Signed-off-by: Christian König <github@yubiuser.dev>
2024-10-20 09:36:28 +02:00
6e905a7f80 Use setFTLConfigValue to set privacy level and logging. The function is sourced already at this point from utils.sh
Signed-off-by: Christian König <github@yubiuser.dev>
2024-10-18 20:22:13 +02:00
3956ca49b6 Don't attempt writing to pihole.toml if file does not exit. FTL needs to be started first
Signed-off-by: Christian König <github@yubiuser.dev>
2024-10-18 20:19:02 +02:00
74e52675f1 Use pihole.toml to decide if installer runs on an update
Signed-off-by: Christian König <github@yubiuser.dev>
2024-10-02 13:50:33 +02:00
74d451a9c7 Show version information after an web only update (#5788) 2024-10-01 05:57:34 +02:00
ada7d2bd31 Fix removing old man page
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-30 21:10:33 +02:00
bcc3a7e35e Show version information after an web only update
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-30 21:04:55 +02:00
c0e39087bc Grouped common dependencies of distros (#5762) 2024-09-28 13:37:11 +02:00
5f1e4680f7 Grouped common dependencies of distros
Signed-off-by: Wouter Servaes <wouterservaes@protonmail.com>
2024-09-27 19:09:09 +02:00
8dbdae40e8 Add fallback option for OS check without hard-coded nameserver (#5751) 2024-09-23 22:59:56 +02:00
6888897999 Revert "Return early during v6 migration if migration dir exists"
This reverts commit 251f3295f3.
2024-09-13 21:15:25 +02:00
251f3295f3 Return early during v6 migration if migration dir exists
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-12 21:32:36 +02:00
62ef2d1777 Add forgetting dash
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: yubiuser <ckoenig@posteo.de>
2024-09-11 18:44:17 +02:00
ce5ef79a3a Reduce code duplications and add check via IPv6 without hard-coded nameserver
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-11 13:43:57 +02:00
fc73cee156 Fix risk of popd without a pushd
`pushd` was inside if, `popd` was outside; there was a risk of not doing a `pushd` and only doing a `popd`.

Signed-off-by: SkyLined <cojmpjum_github.com@sxd.be>
2024-09-04 20:33:54 +02:00