4285 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
DL6ER	f4965d8493	Merge pull request #3135 from pvogt09/development ... Move permission change behind git reset	2020-04-28 19:44:58 +02:00
DL6ER	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
DL6ER	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
MichaIng	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
pvogt09	462457fe7f	Merge branch 'development' into development	2020-04-24 12:09:49 +02:00
Adam Warner	d18a8b1b8a	Merge pull request #3205 from MichaIng/patch-5 ... Reduce apt-get install verbosity	2020-04-19 15:28:48 +01:00
Adam Warner	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
Adam Warner	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
Mohammed Swillam	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
DL6ER	1632632668	Merge pull request #3259 from pi-hole/update_devel ... Update development from release/v5.0	2020-04-08 12:28:29 +02:00
DL6ER	982c1b0059	Merge branch 'release/v5.0' into development ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-08 12:02:53 +02:00
M4x	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
pvogt09	40ac3e7eb7	remove pihole group during uninstall ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2020-04-04 19:22:37 +02:00
pvogt09	25c5661c1b	fix stickler errors ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2020-04-03 19:22:30 +02:00
pvogt09	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
DL6ER	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
DL6ER	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
DL6ER	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
Adam Warner	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
Adam Warner	dc35709a1b	Remove hosts-file.net from default lists	2020-03-31 17:39:21 +01:00
DL6ER	0fad979206	Merge pull request #3230 from pi-hole/fix/remove-19036 ... Remove 19036 trust anchor	2020-03-27 19:57:41 +01:00
DL6ER	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
Adam Warner	1b35eebad8	Merge pull request #3207 from pi-hole/tweak/resolvconf ... Remove resolvconf dependency	2020-03-24 13:11:22 +00:00
Adam Warner	4994da5170	Update automated install/basic-install.sh	2020-03-12 18:48:40 +00:00
Adam Warner	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
Adam Warner	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
Adam Warner	dbc54b3063	remove resolvconf dep ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-03-11 18:47:59 +00:00
MichaIng	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
XhmikosR	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
DL6ER	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
DL6ER	22ce5c0d70	Fix incorrect type description. (#3201) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-03-08 16:32:37 -07:00
jnozsc	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
Dan Schaper	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
Dan Schaper	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
Dan Schaper	360d0e4e6b	Loop through array of lists. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-03-02 08:07:10 -08:00
Dan Schaper	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
Adam Warner	027b97cbfa	Merge pull request #3185 from msamendinger/removewget ... Remove wget from PIHOLE_DEPS	2020-03-01 21:15:32 +00:00
msamendinger	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
Adam Warner	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
Adam Warner	dc8ae4f0ab	Merge pull request #3127 from pi-hole/fix/removeFunding ... Delete FUNDING.yml	2020-02-28 22:47:20 +00:00
Adam Warner	d2a8b4d2b9	Merge pull request #3180 from pi-hole/release/v4.4 ... Tidying up	2020-02-28 22:34:41 +00:00
Adam Warner	c07d86b9f9	Merge branch 'release/v5.0' into release/v4.4	2020-02-28 22:24:11 +00:00
Adam Warner	58785020bd	Merge pull request #3161 from pi-hole/cherry-pick-4.3.5 ... cherry pick 4.3.5 into 5.0	2020-02-25 20:42:39 +00:00
DL6ER	1c74b41869	Add use-application-dns.net = NXDOMAIN in ProcessDNSSettings rather than in the template so we can ensure that it will survive config-renewals. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-25 20:41:35 +00:00
Adam Warner	6104d81622	Safeguard against colour output in grep commandadd -i to grep to make search for "Location" case-insensitive ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-02-24 20:36:45 +00:00
Adam Warner	121c93e822	Merge pull request #3160 from pi-hole/release/v4.3.5 ... Hotfix 4.3.5	2020-02-24 20:16:54 +00:00
Adam Warner	b4c2bf678f	Safeguard against colour output in grep commandadd -i to grep to make search for "Location" case-insensitive ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-02-24 20:02:48 +00:00
Adam Warner	14944b0283	Merge pull request #3157 from pi-hole/release/v4.3.4 ... Release v4.3.4	2020-02-24 18:48:03 +00:00
Adam Warner	8ecaaba247	Compare daemons to expected results. (#3158) (#3159) ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Co-authored-by: Dan Schaper <dan@glacialmagma.com>	2020-02-24 18:00:19 +00:00
Dan Schaper	0fbcc6d8b5	Compare daemons to expected results. (#3158) ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-02-24 17:38:37 +00:00