Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity
4854 commits 8 branches 109 tags 27 MiB
Commit graph

1188 commits

Author SHA1 Message Date
Adam Warner
e393048488
Merge pull request #4229 from MichaIng/patch-3 
Hardcode whiptail dimensions to 20 rows and 70 chars width
 2021-09-11 21:37:14 +01:00
Adam Warner
89e187947e
Merge pull request #4282 from pi-hole/new/RFC6761 
Install RFC6761 config file
 2021-09-11 20:44:46 +01:00
Christian König
839a70cc37 Add sudo to apt-get recommendation 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-08-27 19:16:15 +02:00
DL6ER
ff64d8cf4d
Use variable in user output, too 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-16 09:57:12 +02:00
MichaIng
e1dca46423 Hardcode whiptail dimensions to 20 rows and 70 chars width 
With the suggested way to call the installer via "curl -sSL https://install.pi-hole.net | bash", STDIN is no terminal, but overridden by the curl output, hence in most cases, the minimum dimensions were applied, even on larger screens. All whiptail calls are hence assured to work fine with those dimensions, aside of one case, making the calculations obsolete.

This commit hardcodes the whiptail dimensions to the prior minimum and removes the calculations. This also helps with testing, as it does not matter anymore how the script is called, and developers have a clearly defined space to make dialogs look nice, including line breaks, menu and list heights.

The only case which does not fit the 70 character width, the second menu entry of the "pihole -r" dialog, has been shortened accordingly. This was not an issue before, as "pihole -r" does not override the scripts STDIN and hence did allow larger dimensions based on the now removed calculations.

See the following discussions for reference:
- https://github.com/pi-hole/pi-hole/issues/3323
- https://github.com/pi-hole/pi-hole/pull/4197#issuecomment-876702380

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-08-15 18:04:11 +02:00
DL6ER
ea5a3bf0b2
Install RFC6761 config file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-15 11:21:24 +02:00
Adam Warner
bdab701470
Remove dhcpcd5 dependency, however still help the user set the static IP if dhcpd5 is already installed (i.e on raspbian) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 19:02:37 +01:00
Adam Warner
1ecb9165ee
Remove weird global counter 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 19:02:37 +01:00
Adam Warner
2ff3b95117
put FTL Install back to where it was 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 19:02:37 +01:00
Adam Warner
3ad5097b12
Change initial install script order: 
1. Ensure we have a compatible package manager
  2. Install required packages for os_check to run (we need dnsutils and grep for this
  3. Try to install FTL
  4. FTL installed? Install installer dependencies and continue as normal - no other dependencies are installed until user has gone through all whiptails

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 19:02:37 +01:00
Adam Warner
d68a2ffaf3
Install only minimal requiered package before performing os_check 
Co-authored-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 19:02:36 +01:00
Adam Warner
913dcead7f
move chmod/chown of macvendor.db to pihole-FTL.service 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 19:02:36 +01:00
Adam Warner
1358209a9a
rename distro_check to package_manager_detect, as it is more in keeping with what the function actually does 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 19:02:36 +01:00
DL6ER
d0eb0d5037
Remove extra failure display when installation of logrotate file is skipped because the file already exists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-28 21:18:02 +02:00
Dan Schaper
b1ea60484e
Guard for logrotate func non-zero return 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-07-26 13:22:26 -07:00
Daniel
fdca19e66d Support and test Debian Bullsye (11) 
Signed-off-by: Daniel <daniel@developerdan.com>
 2021-07-07 19:09:54 +00:00
Adam Warner
c120f8a8d8
Revert "Include lighttpd-mod-deflate since it is no longer provided by default in Bullsye" 2021-07-02 22:09:41 +01:00
Daniel
2b49988013
Include lighttpd-mod-deflate in the PIHOLE_WEB_DEPS list since it is no longer provided by default in Debian Bullseye 
Signed-off-by: Daniel <daniel@developerdan.com>
 2021-07-01 02:20:22 +00:00
Dan Schaper
4f660966d0
Shellchecker 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-06-20 11:19:19 -07:00
Dan Schaper
7df22cd8e0
Check for logroate script existing first. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-06-20 11:18:33 -07:00
MichaIng
f3ceebbe06
Re-remove wget from dependencies 
The dependency has been removed here: https://github.com/pi-hole/pi-hole/pull/3185
But accidentally re-added here: 982c1b0059 (diff-595630a29a855f6d667a84ca0662042e826bf3ec56322ef61d4a6ef149147d23)

wget is still not used in any Pi-hole script, hence it can be removed safely from dependencies.

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-04-30 20:48:12 +02:00
MichaIng
2ba350984f Enable PHP8 support for Debian/Ubuntu 
Since PHP8.0, the JSON extension is a core PHP extension and hence the php8.0-json package does not exist and is not required:
- https://www.php.net/manual/json.installation.php
- https://packages.debian.org/php8.0-json

Solves: https://discourse.pi-hole.net/t/php-8-packages-not-found/46286

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-04-18 15:33:05 +02:00
DL6ER
74948ae5c1
The correct port separator is '#' not ':' in dnsmasq style. This should not have been changed in #4083 in the first place. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-14 22:53:12 +02:00
bcambl
d5f13018a7 Merge branch 'release/v5.3' into fedora_33_support 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-04-12 20:06:11 -06:00
jbzdarkid
8090071eff Update regex to disallow leading zeros 
Also updated a comment to point to a non-experimental RFC.

Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-03-21 16:27:08 -07:00
Joseph Blackman
89c80947df Improve regexes for ipv4 matching 
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-03-21 16:24:35 -07:00
jbzdarkid
20b6f9cceb Improve comments in basic-install.sh 
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-03-17 18:37:18 -07:00
bcambl
c6810a0124 touch sysconfig network script when absent 
sysconfig network scripts are missing on pure NetworkManager installs.
This commit touches a placeholder to allow the network configuration to
be generated and loaded via NetworkManager.

Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-01-19 23:06:39 -06:00
Dan Schaper
3f8fedfb16
Revert "Further failsafe check for available APT packages" 2021-01-17 11:10:24 -08:00
Dan Schaper
523f650157
Use the 'Location:' header only. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-01-12 13:42:51 -08:00
DL6ER
c5ed8f8bed
Merge pull request #3537 from MichaIng/patch-2 
Further failsafe check for available APT packages
 2021-01-07 11:56:52 +01:00
bcambl
a5422dbdf6 fix release check for centos stream 
fixes #3947 #3953

Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-12-30 19:45:51 -06:00
Christian König
0d710fc9e3 Change wording in whiptail for adlist selection 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-12-24 21:19:14 +01:00
Adam Warner
eb86a5e3b0
Merge pull request #3937 from yubiuser/remove_malwaredomains 
Remove deprecated malwaredomains list
 2020-12-24 15:24:48 +00:00
Dan Schaper
60fa93ab47
Add fallback for arch detection on i386/x86_64 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-12-23 14:59:28 -08:00
Christian König
b4102547ac Remove deprecated malwaredomains list 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-12-21 13:11:59 +01:00
MichaIng
eb5661b553 Further failsafe check for available APT packages 
- "apt-cache show package" succeeds as well if package is listed as (optional) dependency or conflict by another package, hence is not a 100% reliable measure.
- There is no command which explicitly checks which package/name can be selected by apt-get for install. An install simulation/dry-run is possible as it was before Pi-hole v5.1, or the whole package cache can be scraped, which is still the less time consuming solution.
- Allow to succeed if another package "provides" it, like "php7.3-apcu" provided by "php-apcu" or "awk" provided by "mawk" and "gawk", in which case the non-virtual package is selected automatically by apt-get.

For reference: 066b89fa41

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-12-18 23:20:24 +01:00
Adam Warner
e47eb30a6e
Update automated install/basic-install.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-02 20:49:07 +00:00
Adam Warner
641951b3a0
add some meaningful outputSigned-off-by: Adam Warner <me@adamwarner.co.uk> 2020-12-02 20:40:51 +00:00
Adam Warner
61f13a334d
Don't delete an existing directory and clone our repo in its place. TODO: Something more robust 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-02 20:19:59 +00:00
Christian König
0ecb8bf5e9 Add lsof to dependencies for non Debian OS 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-29 21:05:40 +01:00
Adam Warner
a8e97257d7
Ensure entries of PIHOLE_DNS_10 and above are not deleted when removing PIHOLE_DNS_1 and PIHOLE_DNS_2 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-29 15:08:46 +00:00
Christian König
065e5cb1fe Add DNSSEC to OpenDNS description 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-24 21:02:53 +01:00
Adam Warner
541b53229c
Include secondary upstream DNS for Quad9+Filter+ECS 
Co-authored-by: Daniel Tulleman <github@be-lumino.us>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-18 22:06:03 +00:00
Grégory Sanchez
e26472756f Merge branch 'development' into fix/unattended_install 2020-11-16 23:33:07 +01:00
Grégory Sanchez
6826d9f316 fix(basic-install): unattended install should finish without interaction 
Fixes: https://github.com/pi-hole/pi-hole/issues/3617

Signed-off-by: Grégory Sanchez <gregory.sanchez@icloud.com>
 2020-11-16 23:15:02 +01:00
Adam Warner
bd6ca0ad62
Merge pull request #3825 from yubiuser/tweak/cross 
Change icon from cross to [i] for root user check
 2020-11-15 20:42:05 +00:00
Viet Hung Nguyen
ae4e41eaaa Re-run the script as root instead of piping to bash 
Signed-off-by: Viet Hung Nguyen <hvn@familug.org>
 2020-10-30 23:53:31 +07:00
Christian König
0ae020ef82 Change icon from cross to [i]# for root user check 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-10-29 20:37:08 +01:00
DL6ER
83f2e2d85a
Merge pull request #3801 from pi-hole/new/armv4_armv5_armv8 
Add native ARMv4T, ARMv5TE and ARMv8-A support
 2020-10-18 19:53:56 +02:00