5788 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
DL6ER	f20e4ddf3b	Change message for unknown state to something more useful ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-30 22:28:15 +02:00
DL6ER	40656641b6	Merge branch 'development' into tweak/reload_on_enable_disable	2018-08-30 22:26:57 +02:00
bcambl	6f8e8e98bb	update centos version check test ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-08-29 22:16:11 -06:00
bcambl	24b4aabae9	allow installer to continue with additional rpm based distros ... - FedBerry (Fedora based ARM image) - Scientific Linux (CentOS based) - Add prompt to continue installing on unsupported RPM based distros Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-08-29 20:49:06 -06:00
Mark Drobnak	a9c6d79cda	Merge pull request #2394 from pi-hole/fix/pihole-FTL_owner_group ... Ensure proper unprivileged user if pihole-FTL is started as root	2018-08-29 11:17:39 -04:00
DL6ER	45bf4b02e7	Ensure that when pihole-FTL is launched as user root, it will drop permissions as soon as this is possible. We tell pihole-FTL to change UID/GID to pihole:pihole instead of the default nobody:nogroup. This default causes conflicts with our SQLite3 database. See that corresponding pull request for further details. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-27 16:51:33 +02:00
Mark Drobnak	667c5138cc	Merge pull request #2381 from pi-hole/fix/existing_dnsmasq.conf ... Improve /etc/dnsmasq.conf handling	2018-08-25 18:55:12 -05:00
Patrik Cyvoct	85cf98888d	Merge remote-tracking branch 'origin/development' into ipv6_brackets ... Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>	2018-08-22 09:31:54 +02:00
Patrik Cyvoct	048e5bb9a2	Remove external ipv6 brackets if any in servername ... Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>	2018-08-22 09:11:55 +02:00
DL6ER	b9d47d0dd2	Merge pull request #2378 from pi-hole/fix/pihole-FTL-no-caps ... Start pihole-FTL as root if capabilities are not supported by the system	2018-08-21 14:11:24 +02:00
DL6ER	1813c25117	If config file was backed up: Print info message ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-21 13:07:23 +02:00
DL6ER	940c9c3bae	Merge pull request #2383 from pi-hole/feature/privacy-level-4 ... Add support for privacy level 4	2018-08-21 13:03:41 +02:00
Mcat12	5d0d7336ff	Echo with newline when setting privacy level ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-08-20 20:21:03 -04:00
Mcat12	6a26a05dbf	Fix privacy level whiptail option format ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-08-20 19:40:43 -04:00
Mcat12	c22e94c9c7	Update test to include empty FTL config ... The installer ensures that an FTL config will exist, and creates an empty file if it doesn't. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-08-20 19:33:15 -04:00
Mcat12	4aafa8cf47	Set the FTL privacy level during install ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-08-20 19:20:29 -04:00
Mark Drobnak	9235a11d5f	Merge pull request #2382 from pi-hole/tweak/no-extra-logging ... Don't use extra query logging	2018-08-20 18:33:42 -04:00
Mcat12	f141b9f778	Add support for privacy level 4 ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-08-20 17:36:16 -04:00
DL6ER	1dca1efbc6	Don't use extra query logging ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-20 23:11:23 +02:00
DL6ER	28c6b1393f	Backup existing /etc/dnsmasq.conf if present and ensure that /etc/dnsmasq.conf contains only "conf-dir=/etc/dnsmasq.d" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-20 22:52:22 +02:00
DL6ER	6c97b8b875	Merge pull request #2377 from pi-hole/fix/service-touch-leases ... Touch dhcp.leases to ensure it exists	2018-08-20 11:24:44 +02:00
DL6ER	ec2426b24d	Add clarifying comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-19 19:55:47 +02:00
DL6ER	5cd3b11391	Start pihole-FTL as root if capabilities are not supported by the system ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-19 14:32:19 +02:00
DL6ER	d30b565d98	Touch dhcp.leases to ensure it exists. There are some systems out there where the installer didn't finish on the first run and some users don't have this file being created. Although /etc/pihole should be owned by pihole:pihole, pihole-FTL sometimes fails to open this file and - if this is the case and DHCP is enabled - refuses to start altogether. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-19 13:53:34 +02:00
Mark Drobnak	74008d28a7	Merge pull request #2367 from realtebo/fix-enabling-ftl ... Fix to enable pihole-FTL service before starting it	2018-08-16 16:15:46 -04:00
Realtebo	0d1b3cee4f	Enable FTL service before starting it ... Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>	2018-08-16 17:52:47 +02:00
Realtebo	0b44cb4426	Merge branch 'development' of https://github.com/pi-hole/pi-hole into development	2018-08-16 17:48:35 +02:00
Mark Drobnak	eb8e4496b2	Merge pull request #2354 from realtebo/development ... Create adlist file while running unattended setup	2018-08-16 11:26:07 -04:00
Realtebo	30f45d4df7	Merge branch 'development' of https://github.com/pi-hole/pi-hole into development	2018-08-16 16:52:18 +02:00
Mark Drobnak	24e1c78d52	Merge pull request #2358 from pi-hole/fix/restart_FTl_on_logflush ... Restart pihole-FTL after log flushing	2018-08-16 10:34:25 -04:00
Mirko Tebaldi	476fecbcf5	Fixed typos as suggestes ... Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>	2018-08-14 15:04:42 +02:00
Mirko Tebaldi	327b58fa03	Merge pull request #1 from pi-hole/development ... Merge with current main development branch	2018-08-14 14:55:18 +02:00
DL6ER	d3eea9404d	Merge pull request #2331 from pi-hole/tweak/improve_FTL_download_errormsg ... Improve error message when downloading FTL failed	2018-08-14 13:20:47 +02:00
DL6ER	ca309d3b28	Restart pihole-FTL after log flushing to force reloading history. Fixes #2339 ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-14 13:16:17 +02:00
DL6ER	0ebd68f17f	Review comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-14 09:55:16 +02:00
Mark Drobnak	3696373609	Merge pull request #2345 from pi-hole/NXDOMAIN-tail ... Fix colour tail for use with new blocking methods	2018-08-13 15:01:35 -04:00
DL6ER	165affc39b	list.sh writes into blacklist.txt not black.list so does not need to account for a possibly changed list location ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 18:53:31 +02:00
DL6ER	f794018e0c	Acknowledge temporary file if disabled for "pihole -b" command ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 18:17:14 +02:00
DL6ER	337cc5ca18	BLOCKING -> BLOCKING_ENABLED ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 17:22:10 +02:00
DL6ER	4e4d6b5d1f	Adjust "pihole status" command ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 15:02:00 +02:00
DL6ER	b011adc453	Use new setupVars BLOCKING variable to determine which file to update via gravity ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 14:19:59 +02:00
DL6ER	d8abc1d266	Storing BLOCKING=true/false in setupVars.conf ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 13:49:47 +02:00
DL6ER	6cde066edd	Have gravity detect the presence of files like gravity.list.bck and update this file if present (assuming blocking is disabled) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 13:43:14 +02:00
WaLLy3K	d163e38380	Ensure regex-blocked lines are red ... * Add `regex.list` to seds list Signed-off-by: WaLLy3K <wally3k@pihole.net>	2018-08-13 14:56:38 +10:00
Realtbo	d9195970b7	Create adlist file while running unattended setup ... Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>	2018-08-12 23:21:01 +02:00
DL6ER	20b946eae5	Instead of changing the dnsmasq configuration, we replace gravity.list and black.list by empty files for disabling. When pihole-FTL receives SIGHUP, it will clear its cache and reload all configured lists. If the files are empty, blocking will be disabled as no content to be blocked will be imported. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-12 19:31:00 +02:00
DL6ER	c00357663b	Reload pihole-FTL instead of restart the entire service on "pihole enable/disable" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-12 19:17:20 +02:00
Gusher123	2feb5f22cc	Signed-off-by ... This is my commit message Signed-off-by: Gusher123 <t.siebeling@gmail.com>	2018-08-12 10:05:58 +02:00
Gusher123	f3aee056ad	Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1	2018-08-12 09:59:34 +02:00
Gusher123	91ff5ca0ca	Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1 ... Signed-off-by: Gusher123 <t.siebeling@gmail.com>	2018-08-12 09:58:45 +02:00