3274 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Warner	8cf8da4c78	- Check file /etc/pihole/ftlbranch for current FTL branch, download from github if master, or pi-hole.net if other ... - Check if downloaded binary file can resolve queries, if so stop and disable dnsmasq - Add service_disable function - Add dependency libcap2-bin on debian to enable setcap. Need to check other distos -Always download FTL binary if /etc/pihole/ftlbranch does not contain "master" - Change some strings/variables that reference dnsmasq and change them to pihole/pihole-FTL Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-06 18:44:57 +00:00
Adam Warner	ad1f210528	As we no longer add source lists to the whitelist by default, gravity falls over on new installs. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-06 18:29:28 +00:00
Adam Warner	cadab61a21	Merge branch 'development' into FTLDNS	2018-03-05 21:33:53 +00:00
Adam Warner	0b87f489d5	Look for pihole-FTL, not dnsmasq! ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-03 15:59:56 +00:00
Mark Drobnak	e3e5e016d5	Merge pull request #2016 from pi-hole/bugfix/mktemp ... Bugfix mktmp > mktemp	2018-03-02 16:03:11 -05:00
Dan Schaper	3425b9a82e	Fix mktmp > mktemp ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-03-02 12:28:53 -08:00
Ryan Knapper	5ecfc58e5f	Require exact match ... Updated to require an exact match to reduce false-positives, as suggested by DL6ER. Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	2018-02-28 13:06:07 -05:00
Dan Schaper	6011dd7372	Merge pull request #2000 from pi-hole/fix/FTL_Install ... Use pushd/popd and create random temporary directory	2018-02-26 21:55:12 -08:00
DL6ER	7ed45d26c2	Remove " " at some places where they shouldn't be ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-26 17:26:51 +01:00
DL6ER	fcdc85eab8	Remove dnsmasq from dependencies ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-25 23:47:11 +01:00
DL6ER	56a2924a33	Unprivileged processes are subject to full permission checking based on the process's credentials, we have to explicitly allow pihole-FTL to bind to ports < 1024 (port 53 for DNS) and for various advanced network-related operations (to allow for handling DHCP requests) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-25 23:42:26 +01:00
DL6ER	09886a3f11	Add resolveconf config to pihole-FTL.service ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-25 10:11:11 +01:00
DL6ER	e8ec0dc701	Use pihole-FTL resolver in pihole and gravity ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-25 09:34:04 +01:00
Dan Schaper	41d9d57c84	Merge pull request #1996 from pi-hole/fix/AlternativeWhitelistFromWebFix ... Specifty `LC_ALL=C` when dealing with sorted lists.	2018-02-24 07:22:44 -08:00
DL6ER	b87bcc8f5f	Modifications in pihole-FTL.service for FTLDNS ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-24 13:23:06 +01:00
Dan Schaper	4606693e62	Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-02-22 20:13:38 -08:00
Adam Warner	e61d8e4fb8	adlists.default no longer used. No need to reference it. ... Use --force switch of gravity to force the cache refresh Signed-off-by: Adam Warner <adamw@rner.email>	2018-02-22 14:45:31 +00:00
Adam Warner	6b4685b333	much more elegant to export LC_ALL at the beginning of the script! ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-02-21 11:33:29 +00:00
Adam Warner	d4ac818a0b	Specifty LC_ALL=C when dealing with sorted lists. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-02-21 11:23:07 +00:00
Ryan Knapper	c17d95bfed	Proper output for debug CPU detection ... Inserted "log_write" to properly output CPU detection lines. Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>	2018-02-19 10:22:28 -05:00
Mark Drobnak	f14184df30	Merge pull request #1982 from LudovicRousseau/master ... Create blacklist.txt if not existant	2018-02-18 15:32:01 -05:00
Ludovic Rousseau	47bbea9ba7	Use " " to protect parameter substitution ... Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-02-18 21:20:04 +01:00
Mark Drobnak	7265935cd4	Merge pull request #1915 from ryanknapper/development ... Add conditional forwarding options to webpage.sh	2018-02-18 12:51:46 -05:00
DL6ER	40bda4b3d1	Merge pull request #1981 from pi-hole/fix/always_repair_pihole-FTL.service ... Always replace pihole-FTL.service	2018-02-18 17:26:17 +01:00
Ludovic Rousseau	b7891f92a5	Create blacklist.txt if not existant ... Closes: https://github.com/pi-hole/pi-hole/issues/1888 Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-02-18 14:19:49 +01:00
DL6ER	8b79017d0f	Always replace pihole-FTL.service ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-18 13:07:22 +01:00
DL6ER	5465ac9ba0	Merge pull request #1929 from pi-hole/fix/flushDB ... pihole -f: Flush database	2018-02-17 17:45:15 +01:00
DL6ER	b8eaa9a527	Use double quotes to precent globbing and word splitting ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-17 13:01:00 +01:00
DL6ER	5d274008db	Use possibly user-defined database location when flushing ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-17 12:58:57 +01:00
DL6ER	220e755596	Merge pull request #1973 from pi-hole/tweak/stop-autowhitelisting ... Don't auto-whitelist blocking list domains	2018-02-17 12:23:14 +01:00
DL6ER	fc5034696d	Don't auto-whitelist blocking list domains ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-16 19:42:33 +01:00
DL6ER	4a6f77bc59	Merge pull request #1967 from pi-hole/master ... Git flow Pi-hole v3.3	2018-02-15 21:09:22 +01:00
Dan Schaper	1e87850952	Merge pull request #1943 from pi-hole/release/3.3 ... Pi-hole v3.3	2018-02-14 12:48:40 -08:00
Mark Drobnak	3472241289	Merge pull request #1962 from floek/master ... Fixes https://github.com/pi-hole/pi-hole/issues/1772	2018-02-14 13:02:56 -05:00
Florian Freund	a944b6ff79	Fixes https://github.com/pi-hole/pi-hole/issues/1772	2018-02-12 21:28:43 +01:00
Mark Drobnak	6c4741bc61	Merge pull request #1730 from pi-hole/tweak/block-page-no-password ... Disable password field on block page if no password is set	2018-02-11 22:15:20 -05:00
Mcat12	8a42ef431b	Fix Javascript warning when no password is set ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-02-11 21:49:12 -05:00
Mcat12	2cf1f0e8fc	Hide the password input when there is no password ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-02-11 14:07:02 -05:00
Mcat12	55e50eced6	Merge branch 'development' into tweak/block-page-no-password	2018-02-11 13:49:36 -05:00
Adam Warner	30a2923380	Merge pull request #1952 from smopucilowski/fixes ... Trivial spelling mistakes in basic-install.sh comments	2018-02-11 10:43:33 +00:00
Ryan Knapper	f2b3752f3d	lan to local ... Reduced differences. Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	2018-02-07 17:08:55 -05:00
Ryan Knapper	36945a67d0	Prevent redundant entries in to adlists.list ... Grep ${args[3]} and only add if grep -c -eq 0 Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	2018-02-07 17:04:10 -05:00
Sebastian Pucilowski	c5a2ca5c98	Trivial spelling mistakes in basic-install.sh comments ... Signed-off-by: Sebastian Pucilowski <smopucilowski@gmail.com>	2018-02-07 16:56:21 +11:00
Dan Schaper	9f2ce0e296	Merge pull request #1910 from pi-hole/fix/BinaryFileLineInGravity ... Potential fix for #1909	2018-01-28 03:23:19 -08:00
Adam Warner	55e10d8287	replace another grep -F as pointed out by @StarPicard ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-01-28 00:50:15 +00:00
Dan Schaper	94c772e1a8	Merge pull request #1936 from theel0ja/patch-fix-typo ... Fixed a typo	2018-01-27 04:45:53 -08:00
Elias Ojala	2b6d9c34c9	Fixed a typo ... Signed-off-by: Elias Ojala <ojala.s.elias@gmail.com>	2018-01-27 14:36:11 +02:00
Mcat12	1a5c86d32e	Revert "Hide password textbox if there is no password" ... This reverts commit 009fa2f1b7.	2018-01-23 20:28:43 -05:00
Mcat12	c7219fbdff	Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password	2018-01-21 09:09:36 -05:00
DL6ER	4c249a1186	Flush most recent 24 hours from FTL's database ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-01-21 13:48:13 +01:00