gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,781 Commits 27 Branches 79 Tags
0e3205386a8a67c916fcf70725dfbb6289b36667
Commit Graph

1181 Commits

Author SHA1 Message Date
MichaIng
34f464bd6f Remove obsolete iproute APT package check 
The installer contains a check whether the "iproute2" package is available or "iproute", which was required until Debian Wheezy. Since Debian Jessie, the package is named "iproute2", which is true as well for all supported Ubuntu versions, down to Xenial at least:
- https://packages.debian.org/search?keywords=iproute2
- https://packages.ubuntu.com/search?suite=all&keywords=iproute2

Aside of removing obsolete code, this additionally solves an actual error that can happen when the APT lists/cache update failed with DNS resolving and any package, e.g. from a 3rd party repo, contains the "iproute" name as conflict, "replaces", "provides", alias or similar, which is not uncommon as that name existed. In this case, the installer continues, as "apt-get" does not return an error code when failing at DNS resolving, and without "iproute2" installed or in present APT lists "iproute" could then falsely be selected for install.

Additionally the code comment about apt-get calls with minimal output was moved to the actual apt-get install call section, as if refers to issues with package installs that require interactive action and hence output about it to the console. The package cache update as well requires an interactive confirmation when the underlying suite code name changes, e.g. when "buster" becomes "oldstable" and "bullseye" becomes "stable". But that is not what the referred issue was about.

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-07-05 17:30:15 +02:00
Adam Warner
dc5673af5c actually set the chosen web port... 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-03 00:28:05 +01:00
Adam Warner
a02b7e09d1 Offer a chance to change web listening port 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-03 00:28:05 +01:00
Adam Warner
ffeb8cae87 delete some of the commented out parts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-03 00:28:05 +01:00
bcambl
6a312500a0 remove unsupported rpm whiptail user prompt 
- remove support for unmaintained distro 'fedberry'

Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-07-03 00:28:04 +01:00
bcambl
3a122ed11a update unsupported rpm distro_check whiptail message 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-07-03 00:28:04 +01:00
bcambl
8cb175811f update distro_check for centos 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-07-03 00:28:04 +01:00
Adam Warner
8336d49853 more lighttpd refs 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-03 00:28:04 +01:00
Adam Warner
08710746e2 debug doesn't need to check php/lighttpd 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-03 00:28:03 +01: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
DL6ER
01c9bbd3ca Improve processor detection to use the new dedicated ARMv4T, ARMv5TE and ARMv8-A binaries we provide for FTL. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-10-14 20:31:22 +02:00
Adam Warner
59b0a6af6f Remove references to privacy level 4 (no longer functional) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-13 23:53:23 +01:00
MichaIng
615b19c3d6 web server question enhancements (#3225) 
+ Do not ask to install the web server, if the web interface has been deselected before.
+ Add additional info, that PHP modules need to be installed manually, when web server is deselected and the web server user needs to be member of the "pihole" group.
+ Consequently use webroot variable instead of /var/www/html

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-10-09 16:12:21 +02:00
Christian König
e9796d5671 Remove traces of previous default adlists 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-09-28 06:15:46 +02:00
Adam Warner
d6c4f0696f Merge pull request #3698 from yubiuser/remove/FreeSpaceCheck 
Remove check for free disk space and associated variables
 2020-09-21 08:47:41 +01:00
DirkJanIT
b88510d89a Add CACHE_SIZE to setupVars (#3170) 
* Update 01-pihole.conf

Signed-off-by: DoubleOhmSeven <57564379+DoubleOhmSeven@users.noreply.github.com>

* Update basic-install.sh

Signed-off-by: DoubleOhmSeven <57564379+DoubleOhmSeven@users.noreply.github.com>

Co-authored-by: DoubleOhmSeven <57564379+DoubleOhmSeven@users.noreply.github.com>
 2020-09-17 23:13:40 +02:00
Blayne Campbell
4d98e156b6 Merge pull request #3607 from cgzones/selinux 
basic-install: document how to continue after SELinux check
 2020-09-16 23:54:05 -06:00