2b9898e9ca
Fixed indentation
...
Signed-off-by: Matthias Rank <development@m-rank.de >
2020-05-12 21:04:30 +02:00
0add5eb291
Added support for CNAME record add/remvoe
...
Signed-off-by: Matthias Rank <development@m-rank.de >
2020-05-12 21:02:29 +02:00
1b41a5d59a
Merge pull request #3347 from pi-hole/tweak/binary_detection
...
Minor bugfix for Binary detection
2020-05-12 17:31:29 +01:00
987ae3810d
binary, here, should be l_binary
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-05-11 22:03:33 +01:00
742d802940
Merge pull request #3027 from XhmikosR/patch-1
...
Serve JS files with utf-8 charset too
2020-05-05 12:29:27 -07:00
fdaf815f42
Merge pull request #3203 from MichaIng/patch-1
...
Failsafe checks for available APT package
2020-05-05 10:27:08 +02:00
988b1ff02f
Merge pull request #3204 from MichaIng/patch-3
...
Revert using hardcoded php-intl meta package
2020-05-05 10:24:56 +02:00
4710963ccf
Merge pull request #3312 from subdavis/development
...
Remove dead code
2020-05-01 16:43:34 +01:00
1540e5bfda
Remove dead code
...
Signed-off-by: Brandon Davis <git@subdavis.com >
2020-05-01 07:52:33 -04:00
f4965d8493
Merge pull request #3135 from pvogt09/development
...
Move permission change behind git reset
2020-04-28 19:44:58 +02:00
c0cf8dba87
Merge pull request #3226 from MichaIng/patch-6
...
Do not add pihole user to web server group
2020-04-28 19:39:55 +02:00
a9136d752a
Merge pull request #3246 from pvogt09/fix/user_exists
...
fixes #3217 by checking for existing pihole group
2020-04-28 19:38:12 +02:00
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 >
2020-04-26 15:45:29 +02:00
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 >
2020-04-26 15:44:13 +02:00
86d4c9b1e0
Failsafe checks for available APT package
...
When checking for available packages in APT repository, running a dry-run install can fail for other reasons, even if the package is available. Currently, in such case, wrong fallback packages are selected: https://github.com/pi-hole/pi-hole/issues/2888
"apt-cache show <pkg>" is a quicker method to check for available packages. This is now done as well to check if the fallbacks are available. If none is found, the installer exits with meaningful error message and exit code.
In rare cases, the APT list files can be missing when the installer is started. E.g. this could be on a fresh system, APT lists could have been moved to RAM or removed as a cleanup step. "apt-cache" calls will then fail, same as dry-run installs were. To assure that current package lists are checked, update the package cache directly after the Ubuntu universe repo has been added, only in the Debian/Ubuntu block. This renders the variable handling in RH/Fedora block obsolete.
Signed-off-by: MichaIng <micha@dietpi.com >
2020-04-26 15:42:43 +02:00
462457fe7f
Merge branch 'development' into development
2020-04-24 12:09:49 +02:00
d18a8b1b8a
Merge pull request #3205 from MichaIng/patch-5
...
Reduce apt-get install verbosity
2020-04-19 15:28:48 +01:00
e80990c27a
Merge pull request #3282 from pi-hole/revert-3276-feature/support_for_new_cloudflare_dns_for_families
...
Revert "- Support for Cloudflare's new DNS for Families"
2020-04-19 14:32:32 +01:00
e6dcccc7bd
Revert "- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors ( #3276 )"
...
This reverts commit 7e1a8c1ceb
2020-04-18 20:05:54 +01:00
7e1a8c1ceb
- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors ( #3276 )
...
1- 1.1.1.2 (No Malware)
2- 1.1.1.3 (No Malware or Adult Content)
This would allow parents to have more control over the safety of their family's network.
Signed-off-by: Mohammed-Swillam <moh.sayed@hotmail.com >
2020-04-18 11:49:01 +01:00
1632632668
Merge pull request #3259 from pi-hole/update_devel
...
Update development from release/v5.0
2020-04-08 12:28:29 +02:00
982c1b0059
Merge branch 'release/v5.0' into development
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-04-08 12:02:53 +02:00
2de5362adc
Sanitize email address in case of security issues ( #3254 )
...
* Sanitize email address in case of security issues
Signed-off-by: bash-c <aboultraman@gmail.com >
2020-04-05 10:20:35 +01:00
40ac3e7eb7
remove pihole group during uninstall
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2020-04-04 19:22:37 +02:00
25c5661c1b
fix stickler errors
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2020-04-03 19:22:30 +02:00
a993b8b34d
fixes #3217 by checking for existing pihole group
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2020-04-03 13:18:32 +02:00
a2d2639ee8
Merge pull request #3242 from pi-hole/fix/do_not_flush_neigh_cache
...
Do not flush neigh cache
2020-04-01 20:50:28 +02:00
d1caad76d8
Do not flush neigh cache as this is known to create a number of issues. The better aproach to this is to manually flush the ARP cache by either restarting or calling "ip neigh flush all".
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-04-01 17:19:32 +00:00
fff7adfb20
Merge pull request #3236 from pi-hole/PromoFaux-patch-1
...
Remove hosts-file.net from default lists
2020-03-31 23:23:19 +02:00
7d19ee1b25
validate blocklist URL before adding to the database ( #3237 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
Co-authored-by: DL6ER <dl6er@dl6er.de >
2020-03-31 21:48:10 +01:00
dc35709a1b
Remove hosts-file.net from default lists
2020-03-31 17:39:21 +01:00
0fad979206
Merge pull request #3230 from pi-hole/fix/remove-19036
...
Remove 19036 trust anchor
2020-03-27 19:57:41 +01:00
277179f150
Remove 19036 trust anchor, now expired: https://www.icann.org/resources/pages/ksk-rollover
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-03-27 19:34:41 +01:00
1b35eebad8
Merge pull request #3207 from pi-hole/tweak/resolvconf
...
Remove resolvconf dependency
2020-03-24 13:11:22 +00:00
4994da5170
Update automated install/basic-install.sh
2020-03-12 18:48:40 +00:00
175d32c5f6
Set nameservers to be that which have been chosen by the user in the whiptail
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-03-11 18:55:43 +00:00
1481cc583f
Don't set nameserver in dhcpcd.conf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-03-11 18:48:40 +00:00
dbc54b3063
remove resolvconf dep
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-03-11 18:47:59 +00:00
bb936f4fdb
Reduce apt-get install verbosity
...
The new version of the installer moved from debconf-apt-progress to raw apt-get output on installs to solve issues with interactive config file choices. This lead to a largely increases amount of output lines of the installer. To reduce the apt-get output to a minimum, while sustaining interactive input in case of config files, the "-qq" option can be used, which inherits "--yes":
- https://manpages.debian.org/buster/apt/apt-get.8.en.html#OPTIONS
- https://manpages.ubuntu.com/manpages/bionic/man8/apt-get.8.html#options
Signed-off-by: MichaIng <micha@dietpi.com >
2020-03-11 11:01:28 +01:00
7b8611ced0
Assorted typo fixes. ( #3126 )
...
* Assorted typo fixes.
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-03-08 16:53:14 -07:00
497bfd80a5
Update development from release/v5.0 ( #3200 )
...
* Use bash regex instead of awk.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
* Fix incorrect type description. (#3201 )
Signed-off-by: DL6ER <dl6er@dl6er.de >
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-03-08 16:38:53 -07:00
22ce5c0d70
Fix incorrect type description. ( #3201 )
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-03-08 16:32:37 -07:00
4a711340ef
use py3 instead py2 ( #3153 )
...
* use py3 instead py2
Signed-off-by: jnozsc <jnozsc@gmail.com >
* use python 3.6
Signed-off-by: jnozsc <jnozsc@gmail.com >
2020-03-02 23:30:44 -08:00
f617ed2f44
Merge pull request #3186 from pi-hole/fix/awkInQuery
...
Malformed wildcard blocking doesn't crash awk.
2020-03-02 12:39:26 -08:00
bf4fada3b7
Don't quote inside backticks, use unquoted variable.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-03-02 09:52:06 -08:00
360d0e4e6b
Loop through array of lists.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-03-02 08:07:10 -08:00
4f390ce801
Use bash regex instead of awk.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-03-02 05:39:21 -08:00
027b97cbfa
Merge pull request #3185 from msamendinger/removewget
...
Remove wget from PIHOLE_DEPS
2020-03-01 21:15:32 +00:00
d16b472592
Remove wget from PIHOLE_DEPS
...
All external calls have been moved to curl, wget no longer needed as
dependency
Signed-off-by: msamendinger <git@samendinger.de >
2020-03-01 22:06:37 +01:00
e6bfb0fe17
Merge pull request #3152 from pi-hole/release/v5.0
...
Update development with latest release/v5.0 changes
2020-02-28 22:50:15 +00:00
