4f660966d0
Shellchecker
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
7df22cd8e0
Check for logroate script existing first.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
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)
3 years ago
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>
3 years ago
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>
3 years ago
d5f13018a7
Merge branch 'release/v5.3' into fedora_33_support
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
3 years ago
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>
3 years ago
89c80947df
Improve regexes for ipv4 matching
...
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
3 years ago
20b6f9cceb
Improve comments in basic-install.sh
...
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
3 years ago
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>
3 years ago
3f8fedfb16
Revert "Further failsafe check for available APT packages"
3 years ago
523f650157
Use the 'Location:' header only.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
c5ed8f8bed
Merge pull request #3537 from MichaIng/patch-2
...
Further failsafe check for available APT packages
3 years ago
a5422dbdf6
fix release check for centos stream
...
fixes #3947 #3953
Signed-off-by: bcambl <blayne@blaynecampbell.com>
3 years ago
0d710fc9e3
Change wording in whiptail for adlist selection
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
eb86a5e3b0
Merge pull request #3937 from yubiuser/remove_malwaredomains
...
Remove deprecated malwaredomains list
3 years ago
60fa93ab47
Add fallback for arch detection on i386/x86_64
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
b4102547ac
Remove deprecated malwaredomains list
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
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
4 years ago
e47eb30a6e
Update automated install/basic-install.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
641951b3a0
add some meaningful outputSigned-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
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>
4 years ago
0ecb8bf5e9
Add lsof to dependencies for non Debian OS
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
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>
4 years ago
065e5cb1fe
Add DNSSEC to OpenDNS description
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
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>
4 years ago
e26472756f
Merge branch 'development' into fix/unattended_install
4 years ago
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>
4 years ago
bd6ca0ad62
Merge pull request #3825 from yubiuser/tweak/cross
...
Change icon from cross to [i] for root user check
4 years ago
ae4e41eaaa
Re-run the script as root instead of piping to bash
...
Signed-off-by: Viet Hung Nguyen <hvn@familug.org>
4 years ago
0ae020ef82
Change icon from cross to [i]# for root user check
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
83f2e2d85a
Merge pull request #3801 from pi-hole/new/armv4_armv5_armv8
...
Add native ARMv4T, ARMv5TE and ARMv8-A support
4 years ago
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>
4 years ago
59b0a6af6f
Remove references to privacy level 4 (no longer functional)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
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>
4 years ago
e9796d5671
Remove traces of previous default adlists
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
d6c4f0696f
Merge pull request #3698 from yubiuser/remove/FreeSpaceCheck
...
Remove check for free disk space and associated variables
4 years ago
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>
4 years ago
4d98e156b6
Merge pull request #3607 from cgzones/selinux
...
basic-install: document how to continue after SELinux check
4 years ago
e02cf6fac5
further tweaks, plus a spelling mistake correction
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
8e219cb799
Make output more meaningful in case of dig failure.
...
Include dig return code and response in debug run
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
65786ba5d6
Remove check for free disk space and associated variables
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
42f55f5202
Merge pull request #3688 from pi-hole/tweak/os-check
...
Tweaks to os_check() Redux
4 years ago
725f02f442
Merge pull request #3673 from yubiuser/fix/double_check_adlist_not_selected
...
Revert "fix #3336 by creating adlist file even if no list was selecte…
4 years ago
ebdb68a47a
display_warning fixes
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
4 years ago
623ce1fe18
Tabs and debug.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
4 years ago
57e65dd5c0
Use fewer subshells and descriptive variables.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
4 years ago
bb1a6243d6
Merge pull request #3669 from pi-hole/release/v5.1.2
...
Release/v5.1.2 to development
4 years ago
5c72ff75d9
Revert "fix #3336 by creating adlist file even if no list was selected by user"
...
This reverts commit 3c6ea2612d
4 years ago
b5983a3fc1
Do not require first element to be a hex value at any costs. It may also be a : in the valid address ::1
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
319b8eef75
Merge pull request #3527 from MichaIng/patch-1
...
Add default locations to PATH to assure that all basic commands are available
4 years ago
48820d181c
Merge pull request #3620 from yubiuser/tweak/dig_supportedOS
...
Report and exit if dig supportedOS returns nothing
4 years ago
51daeaa6ab
basic-install: document how to continue after SELinux check
...
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
4 years ago
6fc7dc28a2
Count elements of array instead
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
b207ceeab2
Report and exit if dig supportedOS returns nothing
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
8380112129
Resolve conflicts
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
0ff32c3629
Use ns1.pi-hole.net to resolve versions.pi-hole.net so that we do not see DNS cookie issues
...
Co-Authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
0a81d687e8
Update automated install/basic-install.sh
4 years ago
dfcdfd4b0a
Remove empty line
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
ec9f490fcc
Remove separate install function, move to installConfigs(), use pihole syntax
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
331502e14c
Add variable that got lost
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
18c24d985f
Create custom.list during install/update if it doesn't exist
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
ddb36c013d
it helps if the echo goes variable set goes in the right place
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
98dc51869e
accidentally missed \\n
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
510b646736
change up the verbiage with something that works (tested)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
ea22774d16
Wrap entire function in the check for the ENVVAR
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
25b873cf7b
Add default locations to PATH to assure that all basic commands are available
...
Signed-off-by: MichaIng <micha@dietpi.com>
4 years ago
643d2c0f3e
add missing port number validation section to valid_ip6
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
533e5dddd0
clarify examples in case of unsupported OS
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
acfb092e4b
fix minor bug in 5.1
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
3205606fc3
Also validate IPV6 in the `setdns` function
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
2c3aa9ab00
Merge pull request #3491 from pi-hole/fix_ip_address_section
...
Fix fresh install on dev branch not working
4 years ago
bf392d7a60
Merge pull request #3489 from pi-hole/ip_validation
...
Improve IP validation function
4 years ago
bbfbf67fcf
further simplify the function, per @dl6er's suggestion
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
fe30ce10d3
simpler regex suggested by @MichaIng
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
7ea6d7b92b
remove ; so IFS changes don't stick
...
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
1ebf0785b6
move dnsutils/bind-utils to installed deps and only check OS is supported after installing installer deps
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
95f4c632f7
expand valid_ip to allow for custom ports
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
4b59287683
Merge pull request #3441 from pi-hole/new/os_check
...
Display warning if unsupported OS is detected
4 years ago
9844a3288f
Same change as 03a8cff
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
7248d1a504
Ensure that adlistFile is created before chmodding
...
If an user installs Pi-hole without selecting any adlists, the installer emits a warning and exits. By touching the file this is prevented.
Signed-off-by: jesterchen <github@jesterweb.de>
4 years ago
7579ab178a
Update links
...
* use https when possible
* replace coverage with a link to the docs page in README.md
* remove obsolete affiliate link in README.md
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
4 years ago
4f7bb7b811
Remove deprecated Disconnect lists from "defaults"
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
b60ec8a48f
Merge pull request #3248 from MichaIng/patch-8
...
Start pihole-FTL after network
4 years ago
acf2879057
Address sticklr complaints
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
af1129fc28
Add a check at the top of the script to determine if the script is being run on a supported OS
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
414ab53d9a
Use `toggle` instead of `select` to remove any hint of a doubt that the option already selected by default can be deselected
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
5c17e41cf1
Start pihole-FTL after network
...
"$network" on a systemd-driven OS leads to "After=network-online.target" in the generated systemd unit.
This target is no guarantee that all network interfaces have been fully configured, as it depends on the related network services types, but at least it reduces the risk that those have not fully finished their job when pihole-FTL starts. If this is the case, certain issues can occur:
- https://github.com/pi-hole/pi-hole/issues/2924
- https://discourse.pi-hole.net/t/have-to-pihole-restartdns-after-reboot/28772
Runtime files are now consistently created in "/run" instead of "/var/run". The second is a symlink to the first for backwards compatibility but on none-ancient distro versions one should use "/run", systemd even prints a warnings if service files use "/var/run". The service file used "/run" and "/var/run" both, in cases for the same files/directories before, which does not directly cause issues currently, due to the symlink, but is inconsistent at best.
Signed-off-by: MichaIng <micha@dietpi.com>
4 years ago
3c6ea2612d
fix #3336 by creating adlist file even if no list was selected by user
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
4 years ago
7d79cf5cce
Only check SELinux states if "getenforce" command exists
...
- Currently, if the SELinux config file exists, installed SELinux is assumed.
- But removing e.g. an APT package via "apt-get remove" leaves config files in place, or they could be present for other reasons.
- If the getenforce command is not present but the config file is, currently the installer exists without error message when calling getenforce due to "set -e".
- With this change, the presence of getenforce command is checked first. If it is not present, selinux-utils is not installed, which is a core part of SELinux, pulled in by selinux-basics as well. So it can be assumed that no SELinux is active if this command is missing.
Signed-off-by: MichaIng <micha@dietpi.com>
4 years ago
9e96ff37de
Fix merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
987ae3810d
binary, here, should be l_binary
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
fdaf815f42
Merge pull request #3203 from MichaIng/patch-1
...
Failsafe checks for available APT package
4 years ago
988b1ff02f
Merge pull request #3204 from MichaIng/patch-3
...
Revert using hardcoded php-intl meta package
4 years ago
df13b9c32a
Merge pull request #3283 from pi-hole/tweak/remove_firewall_config
...
Remove configureFirewall function, the call to it, and related tests
4 years ago
f4965d8493
Merge pull request #3135 from pvogt09/development
...
Move permission change behind git reset
4 years ago
c0cf8dba87
Merge pull request #3226 from MichaIng/patch-6
...
Do not add pihole user to web server group
4 years ago
a9136d752a
Merge pull request #3246 from pvogt09/fix/user_exists
...
fixes #3217 by checking for existing pihole group
4 years ago
d7bac21149
Dot not add pihole user to web server group
...
This is and was never required and the pihole user does in fact not get any additional permissions through that group.
Signed-off-by: MichaIng <micha@dietpi.com>
4 years ago
dc6c53b6a3
Revert using hardcoded php-intl meta package
...
Using the meta package causes several issues:
- Install on Debian prior to Jessie and Ubuntu prior to Xenial is broken, since those do not serve the meta packages but php5-* packages instead.
- If $phpVer != "php", then multiple conflicting PHP versions can be installed.
- If "${phpVer}-intl" does not pull the correct package, then inherently "${phpVer}-xml" etc are wrong, too. This is theoretically possible, e.g. if PHP7.4 was installed while the webserver uses a concurrently installed PHP7.3 instance. Then the "php" shell command output can differ from what the webserver uses. This theoretical issue would need a different approach to derive $phpVer, not based on the shell command output but by asking the webserver somehow in the first place. But using $phpVer for some modules and hardcoded meta for the others can only lead to inconsistencies and issues.
Signed-off-by: MichaIng <micha@dietpi.com>
4 years ago
Dan Schaper