4009 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dan Schaper	e967fe2266	Merge pull request #2612 from pi-hole/hotfix/v4.2.1 ... Remove user/group from dnsmasq config	2019-02-03 11:36:57 -08:00
Dan Schaper	b5c7657e01	Merge pull request #2614 from pi-hole/hotfix/v4.2.1 ... Merge v4.2.1 hotfix to dev	2019-02-03 11:36:00 -08:00
Mcat12	680d6e2d31	Merge branch 'release/v4.2' into development ... # Conflicts: # automated install/basic-install.sh	2019-02-03 11:14:09 -08:00
Mcat12	7a19d24058	Remove user/group from dnsmasq config ... In the case that FTL is started under root, dnsmasq changes the user to pihole due to this setting. The shared memory is created before this switch, and may cause issues such as failing to delete or reallocate the shared memory. These config lines were necessary before dnsmasq became part of FTL, but now since dnsmasq runs under FTL, we can configure the user/group through FTL. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-02-03 10:55:18 -08:00
Dan Schaper	995ee41d6b	Merge pull request #2600 from pi-hole/release/v4.2 ... Release v4.2	2019-02-03 08:52:07 -08:00
DL6ER	b2f4385232	Avoid infinity loop if gravity optimization fails ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 17:05:00 +01:00
DL6ER	1f9a7d0b0c	Only run VACUUM on "pihole -g -o" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 17:01:38 +01:00
DL6ER	d5feffa117	Do not backup the database ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 16:45:19 +01:00
DL6ER	fc62cf7e2f	Only run VACUUM on "full" gravity runs ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 16:45:06 +01:00
DL6ER	93f1859bab	Store regex in gravity.db as well ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 15:13:18 +01:00
DL6ER	dcf0a605cf	Use views for all tables and set disabled column to false for those tables that support it ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 14:14:14 +01:00
DL6ER	710036adae	Add DISABLED field to white- and blacklist defaulting to false. The two views respect the DISABLED fields for both lists. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 13:34:08 +01:00
DL6ER	8a91fe6992	Store domains in gravit tables: gravity, whitelist, blacklist ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 13:21:26 +01:00
DL6ER	09c4c88a6d	Create and fill gravity.db during pihole -g ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 13:04:31 +01:00
Mark Drobnak	69919ac85c	Merge pull request #2610 from pi-hole/fix/dev-shm ... Change /var/run/shm to /dev/shm	2019-02-02 13:44:39 -05:00
Mcat12	26f2410fe6	Change /var/run/shm to /dev/shm ... The /var directory may not exist (does not exist on Fedora 29), and is simply a symlink to /dev/shm. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-02-02 10:37:12 -08:00
Adam Warner	d43c32e9e8	Merge pull request #2609 from pi-hole/fix/start-service-ftl-checkout ... Fix missed start_service -> restart_service call	2019-02-02 18:27:09 +00:00
Mcat12	5c4ee23795	Fix missed start_service -> restart_service call ... start_service was changed to restart_service. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-02-02 10:19:44 -08:00
Dan Schaper	fb3d871553	Merge pull request #2602 from pi-hole/fix/download_FTL_earlier ... Download FTL earlier in the installer	2019-02-02 06:43:16 -08:00
Adam Warner	ae654730c4	Update automated install/basic-install.sh ... Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>	2019-02-02 08:00:58 +01:00
DL6ER	ec79e86bee	We should really use stop_service as it also includes some nice output ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-01 18:06:57 +01:00
DL6ER	e8dabc71af	Don't try to start pihole-FTL after it has been installed. This will be done a few moments later when gravity is invoked. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-01 17:54:21 +01:00
DL6ER	9c0de0f731	Try to stop pihole-FTL before and (re)start pihole-FTL after the install command ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-01 17:39:12 +01:00
DL6ER	4948862dce	Fail hard if FTL binary could not be installed ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-31 20:10:52 +01:00
DL6ER	7479485d45	Add test for the case the binary variable is unset (defaults to "tbd" in this case) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-31 20:00:26 +01:00
Mark Drobnak	1e284f69ea	Merge pull request #2587 from pi-hole/new/network-table ... Download macvendor database	2019-01-28 20:27:13 -05:00
DL6ER	516ed83638	Add "|| true" to the curl command as a failed download is no show-stopper for the overall install process. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-28 20:48:30 +01:00
Mark Drobnak	26361883b4	Merge pull request #2601 from pi-hole/fix/double_disable_kills_gravity ... Prevent double disabling/enabling	2019-01-27 13:54:33 -05:00
DL6ER	d26f2dcb2c	Use global binary variable in tests for automated install ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-24 09:47:28 +01:00
DL6ER	cc657c0c26	Rename subroutine start_service() to restart_service() because this is what it does ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-24 09:37:03 +01:00
DL6ER	d90d7b6927	Call FTL download/installation early on in the installation process. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-24 09:36:27 +01:00
DL6ER	de6dc90575	Don't diable pihole-FTL before calling install. root should be able to overwrite the binary in any case. The binary has already been downloaded and hash-verified here so we don't expect any errors in this binary. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-24 09:32:33 +01:00
DL6ER	3cdd6204c5	Move dnsmasq disabling and config file rewriting into a dedicated subroutine ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-24 09:31:02 +01:00
DL6ER	d996e9c9ee	Fix inconsistent handling of binary variable. get_binary_variable() stores the result into a global variable we pass later on as argument to FTLinstall() and define a local variable with the same name. This is fixed by only using the globa variable in all places not. This is still not a very elegant solution but it is also not subject of the current PR. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-24 09:28:09 +01:00
DL6ER	a4ba8d4b8f	Prevent double disabling/enabling by checking BLOCKING_ENABLED value in setupVars.conf ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-24 09:16:24 +01:00
xch12i5	cd8a423b32	Solves RegEx issue and updates documentation. ... Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>	2019-01-20 16:09:25 +01:00
Mark Drobnak	f7ca74cf1d	Merge pull request #2598 from pi-hole/fix/remove-norton ... Remove Norton DNS	2019-01-19 20:52:37 -05:00
Mark Drobnak	ebba32e1c4	Remove Norton DNS ... Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	2019-01-19 20:45:19 -05:00
xch12i5	e02da90faa	Replaces double quotes by single quotes and updates documentation. ... Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>	2019-01-19 17:52:28 +01:00
xch12i5	0de5132e2b	Solves RegEx issue. ... Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>	2019-01-19 17:07:27 +01:00
Mark Drobnak	7d2507527a	Merge pull request #2593 from TheLastProject/feature/standardized-dns-list ... Standardize DNS list and write to file for AdminLTE	2019-01-13 11:10:45 -08:00
Sylvia van Os	97decb3a73	Standardize DNS list and write to file for AdminLTE ... Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>	2019-01-13 19:38:04 +01:00
DL6ER	f360959efc	Download macvendor database from ftl.pi-hole.net when downloading a new FTL binary. Users who want to update the database more frequently than on each FTL release can use the python script from the FTL repository to generate the database themselves. The macvendor database is an optional component so a failing download is no reason to interrupt the installer. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-09 19:26:19 +01:00
Mark Drobnak	465589c0fd	Merge pull request #2575 from LudovicRousseau/fix2 ... Do not ask admin password just for help documentation	2019-01-07 00:07:53 -05:00
Mark Drobnak	9fcf7a2610	Merge pull request #2581 from bcambl/remove_bc_dep ... remove unused dependency (bc)	2019-01-04 19:01:31 -05:00
bcambl	3035fbf468	remove unused dependency (bc) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2019-01-04 17:17:42 -06:00
DL6ER	c4c354bc4b	Merge pull request #2578 from pi-hole/new/libcap-dev ... Add libcap as dependency	2019-01-03 16:08:45 +01:00
DL6ER	c5da1bb952	Add libcap as Fedora dependency ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-03 10:39:46 +01:00
DL6ER	486c41a69a	Add Debain dependency libcap2 needed for FTL's capability check on startup ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-03 10:39:10 +01:00
DL6ER	87800a3659	Merge pull request #2570 from pi-hole/tweak/wpad ... Add wpad vulnerability fix as suggested by dnsmasq.conf.example	2019-01-03 00:10:31 +01:00