arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-03-07 03:36:06 +00:00
Code Issues Releases Wiki Activity
6,632 Commits 13 Branches 115 Tags 24 MiB
f207385269
Commit Graph

1564 Commits

Author SHA1 Message Date
Christian König
f08c54e166
Create dependency package on RPM distros 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-11-06 20:12:09 +01:00
Christian König
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
yubiuser
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
Christian König
8bf6480aed
Set exit code explicitly everywhere 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-10-20 09:36:28 +02:00
Christian König
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
Christian König
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
Christian König
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
yubiuser
74d451a9c7
Show version information after an web only update (#5788) 2024-10-01 05:57:34 +02:00
Christian König
ada7d2bd31
Fix removing old man page 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-30 21:10:33 +02:00
Christian König
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
yubiuser
c0e39087bc
Grouped common dependencies of distros (#5762) 2024-09-28 13:37:11 +02:00
Wouter Servaes
e9fdfac569
Added common dependencies to uninstall script for removal 
Signed-off-by: Wouter Servaes <wouterservaes@protonmail.com>
 2024-09-27 19:09:09 +02:00
Wouter Servaes
5f1e4680f7
Grouped common dependencies of distros 
Signed-off-by: Wouter Servaes <wouterservaes@protonmail.com>
 2024-09-27 19:09:09 +02:00
yubiuser
8dbdae40e8
Add fallback option for OS check without hard-coded nameserver (#5751) 2024-09-23 22:59:56 +02:00
Christian König
6888897999
Revert "Return early during v6 migration if migration dir exists" 
This reverts commit 251f3295f3.
 2024-09-13 21:15:25 +02:00
Christian König
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
yubiuser
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
Christian König
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
SkyLined
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
Christian König
50dcd8d62f
Add fallback option for OS check without hard-coded nameserver 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-03 22:31:13 +02:00
Christian König
a21b4c5203 Update existing logrotate files to inlcude webserver.log 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-08-28 08:46:16 +02:00
DL6ER
9e9c985245
FTL checkout: Check for availability of branches before trying to download from the webserver. Also, fix check_download_exists() possibly killing the script on non-availability of requested branches 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-08-26 06:11:42 +02:00
DL6ER
a302d7b5d7
Make the help text of "pihole checkout [what] [branch]" more colorful 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-08-26 05:22:15 +02:00
Christian König
fc156f521c Fix setting query logging and privacy level 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-08-19 20:58:34 +02:00
Christian König
1ed5994fa5 Remove temporal log file symlink code. It was introduced 2 years ago with v5.11 and always thought to be temporarily only 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-07-29 09:25:12 +02:00
Ikko Eltociear Ashimine
5cb740ef01
chore: update basic-install.sh 
minor fix

Signed-off-by: Ikko Eltociear Ashimine <eltociear@gmail.com>
 2024-07-10 14:29:40 +09:00
DL6ER
7bf97cf02a
Merge branch 'development-v6' into new/migrate_dnsmasq_conf 2024-05-12 09:51:55 +02:00
Dominik
3abd2c04ce
Also check for IPv6 address for configured DNS servers (#5560) 2024-05-12 09:33:08 +02:00
DL6ER
398f90f7f4
Non-matching checksums are not always corruption. Actually, they will instead be caused by binaries updated on the remote branch. This is most seen with frequently channging branchs such as development-v6 at this time. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-28 09:12:51 +01:00
DL6ER
82a83c497d
Reduce code-duplication 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-10 21:18:13 +01:00
DL6ER
2fd0de4743
Verify that we actually downloaded a valid checksum before comparing it to the local one. This covers situations where downloading the checksum from remote might have failed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-10 08:43:37 +01:00
DL6ER
ed1a6278b7
Merge branch 'development-v6' into new/migrate_dnsmasq_conf 2024-02-19 21:29:11 +01:00
DL6ER
8b3469cabc
Merge branch 'development-v6' into development-v6-merge-development 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-02-11 16:41:41 +01:00
Dominik
8f36fdf11c
Make IDs of anti-/gravity lists available in vw_(anti)gravity (#5526) 2024-02-09 20:52:29 +01:00
Adam Warner
f193edd428
Merge branch 'development' into development-v6-merge-development (resolved conflicts) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-02-09 19:22:53 +00:00
DL6ER
31a8f150b2
Add checking for availability of ftl.pi-hole.net when using FTL from a custom branch. If the server is down (or the user is offline, cannot resolve the domain, etc.), we fail early and hard instead of possibly corrupting the installation 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-01-31 08:00:28 +01:00
DL6ER
07b448d784
Also check for IPv6 address for configured DNS servers 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-01-30 19:24:33 +01:00
DL6ER
8e8c7ecad2
Run gravity upgrade on checkout/update 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-12-25 05:59:41 +01:00
Christian König
274d4c263c
Add bash-completion to PIHOLE_DEPS 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-12-09 21:23:39 +01:00
Christian König
d854eb1a97
Add lshw to Pi-hole deps 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-13 23:04:44 +01:00
Christian König
f65b126433
Move custom.list to /hosts/custom.list 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-13 21:37:41 +01:00
DL6ER
e8884083ef
Apply suggestions from code review 
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>
 2023-11-07 08:58:31 +01:00
DL6ER
e3c6f162d8
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: DL6ER <DL6ER@users.noreply.github.com>
 2023-11-07 08:57:56 +01:00
DL6ER
0b4131189d
Migrate Pi-hole created files out of /etc/dnsmasq.d into a pihole owned directory 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-06 14:55:34 +01:00
yubiuser
758ace57c0
Check for valid OS via IPv4 and IPv6 (#5305) 2023-11-04 08:02:38 +01:00
Christian König
480a8c8d7f
Remove idn2 as punycode conversion is handled by FTL 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-31 21:02:26 +01:00
DL6ER
842a9d7778
Address review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-10-22 08:33:56 +02:00
DL6ER
369ccf13a8
Move FTL binary availability check after the supported OS check 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-10-21 21:40:21 +02:00
DL6ER
38ecc1693f
Further simplify the ARMv6 test 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-10-21 20:39:32 +02:00
DL6ER
30bfc7cc9f
Add binutils tot he OS check dependencies as we need it to check if the local system is abel to run any of our precompiled FTL binaries 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-10-21 19:15:10 +02:00
DL6ER
45687d675b
Fix the binary detection for ARMv6 and simplify the router overall 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-10-21 19:13:45 +02:00
DL6ER
ca7836bf71
Remove now obsolete GLIBC version check 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-10-21 19:05:45 +02:00
DL6ER
8bcd1d4c54
*BREAKING* Drop support for ancient ARMv4 and ARMv5 (#5445) 2023-10-21 18:27:42 +02:00
yubiuser
6cf39d9b92
Remove temp dir created when downloading FTL (#5429) 2023-10-20 09:25:10 +02:00
DL6ER
c571d8d37d
Drop support for ancient ARMv4 and ARMv5, the Debian binaries turn out to cause unresolvable SIGFPE on ARMv6 and lower. Fortunately, we can still use the Alpine binaries on all Raspberry Pi models (even the oldest ones) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-10-19 22:13:44 +02:00
Christian König
d77dbf736c
Logrotate config file needs to be owned by root 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-18 22:09:38 +02:00
Christian König
123ba1f154
Remove temp dir created when downloading FTL 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-15 22:15:11 +02:00
yubiuser
2841a33b81
Set owner of gravity output files to pihole (#5419) 2023-10-14 19:40:27 +02:00
Christian König
46ff257344
Remove Chronometer 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-12 13:44:51 +02:00
Christian König
2061f3a70e
Set owner/permissions at the right place 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-11 21:22:12 +02:00
Christian König
22863845a0
Set owner/group of /etc/pihole to pihole 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-09 22:05:01 +02:00
Christian König
679aab10d0
Run gravity as user pihole 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-09 21:53:37 +02:00
Adam Warner
71357ecae7
adminlte->web 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-08 14:12:02 +01:00
Adam Warner
7886dc0172
adminlte->web 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-08 14:09:47 +01:00
Christian König
edf0060acf
Fix spellcheck errors 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-06 22:26:08 +02:00
Adam Warner
885b626a68
Some unrelated spelling mistakes that spellcheck is grumbling about 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-04 16:22:01 +01:00
Christian König
c33963b250
Check for valid OS via IPv4 and IPv6 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-27 15:11:47 +02:00
Christian König
3c693c1da5
Apply suggestions from code review 
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-06 12:04:55 +02:00
Christian König
5ae0405446
Ensure pihole-FTL can write custom.list 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-03 20:46:01 +02:00
Adam Warner
d637d2a7a5
Simplify nested if statements. 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-18 21:10:06 +01:00
Adam Warner
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
Adam Warner
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
Adam Warner
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
DL6ER
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
DL6ER
913be6c349
Print detected CPU arch 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-06-09 19:01:14 +02:00
DL6ER
1c4e58efe3
Use exact architecture matching binaries where appropriate 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-06-09 15:53:02 +02:00
DL6ER
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
Christian König
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
Christian König
366345e87e
Fix no_installs 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-04 20:31:48 +02:00
DL6ER
667418c71d
Use new FTL binary names 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-06-04 20:02:38 +02:00
Christian König
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
Adam Warner
792b0d419b
Test fixes 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-01 19:29:47 +01:00
Christian König
7351a4d3b1
Merge branch 'development' into development-v6 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-01 15:45:05 +02:00
Christian König
f7b9d70054
Remove man page for pihole-FTL 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-30 21:39:10 +02:00
Adam Warner
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
Adam Warner
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
Adam Warner
0568a69d83
Use WEBPORT instead of PRIVACY_LEVEL to set the web port... 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Adam Warner
b8acccde90
Update comments on the move of /etc/dnsmasq.old -> /etc/dnsmasq.old to better reflect why we are doing it 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Adam Warner
e3ffec5762
Change when old configs are removed 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:15 +01:00
Adam Warner
0e558e4c36
Remove some code that installs the blockpage/sets up web directories 
Remove some code that disables dnsmasq if it is running
Create dnsmasq.d directory if it does not exist
 2023-05-27 11:51:15 +01:00
Adam Warner
31f16510e2
Clear out some no longer needed ftl/dnsmasq config code 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:15 +01:00
Adam Warner
d2d1195928
Needs tweaking, offer chance to change web interface port 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:15 +01:00
Adam Warner
31ee15200d
gut the install script of references to web server/lighttpd 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:15 +01:00
MichaIng
b74c6d5120
Add support for RISC-V 64-bit installs 
Signed-off-by: MichaIng <micha@dietpi.com>
 2023-05-03 20:52:28 +02:00
Christian König
c96463bda2
Fix getting 'privacylevel' 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-03-22 23:00:10 +01:00
Adam Warner
58275ecd13
Revert "Ignore commented lines when reading PRIVACYLEVEL from config file" 2023-03-22 21:52:39 +00:00
Dan Schaper
fb032ea6e7
Ignore commented lines when reading PRIVACYLEVEL from config file (#5177) 2023-03-22 12:23:40 -07:00
MichaIng
73de49323c
Remove systemd service and optionally override configs on uninstall 
This has been forgotten when adding the new native systemd service.

Signed-off-by: MichaIng <micha@dietpi.com>
 2023-02-27 16:51:32 +01:00
Christian König
4fd0f15d90
Ignore commented lines when reding PRIVACYLEVEL from config file 
Create dedicated getVal function in utils.sh as it might be useful somewhere else
Account for tailing comments and $key not being on the first line

Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-21 21:03:55 +01:00
Adam Warner
c65ea9c47c
Adam does not always think things through completly. He will go and sit on the naughty step now. 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 20:49:58 +00:00