3720 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Drobnak	204a4e459b	Merge pull request #2637 from TheNoim/patch-1 ... Support pi hole behind a reverse proxy with ssl	2019-03-13 22:12:00 -04:00
DL6ER	0a53e966ea	Merge pull request #2659 from pi-hole/tweak/warn_if_FTL_not_on_master ... Warn user during update if FTL is on a custom branch	2019-03-03 09:34:11 +01:00
DL6ER	2e17c23333	Don't warn if user is on development as this branch is constantly updated ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-03-02 16:40:59 +01:00
DL6ER	63f3381a2b	Warn user if FTL is not on branch master ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-03-02 16:36:49 +01:00
Mark Drobnak	2292720fed	Merge pull request #2650 from mmphego/patch-1 ... Update README.md	2019-03-01 13:19:31 -05:00
Mpho Mphego	b77efa521f	Update README.md ... Removed the extra double quote. Signed-off-by: Mpho Mphego <mpho112@gmail.com>	2019-03-01 09:38:36 +02:00
Mpho Mphego	cfe221706b	Update README.md ... Changed badges from HTML code to markdown for consistency Signed-off-by: Mpho Mphego <mpho112@gmail.com>	2019-02-27 09:57:23 +02:00
Dan Schaper	293e2a8e80	Merge pull request #2647 from pi-hole/feature/curl_debug ... Use `curl` instead of `openssl` for debug upload.	2019-02-23 09:11:02 -08:00
Dan Schaper	71cd6c137b	Use curl instead of openssl for transmission of unmodified ... log file. We want ansi color codes to be sent. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2019-02-23 04:13:44 -08:00
Mark Drobnak	58f198626a	Merge pull request #2640 from pi-hole/new/DebugAdditions ... Add git status/diff to debug log	2019-02-18 19:28:21 -05:00
Adam Warner	a145f1d931	Be more verbose with debug script output ... If output of `git status -s` is non-null display changes if output of `git diff` is non-null, display diff Signed-off-by: Adam Warner <adamw@rner.email>	2019-02-18 22:32:53 +00:00
Mark Drobnak	9748f19172	Merge pull request #2639 from pi-hole/hotfix/v4.2.2 ... Update development from hotfix/v4.2.2	2019-02-18 13:54:08 -05:00
DL6ER	ba1e94d3d9	Merge pull request #2626 from pi-hole/hotfix/v4.2.2 ... Pi-hole Core v4.2.2	2019-02-18 18:36:13 +01:00
Nils Bergmann	cd9fadbc44	Remove protocol determination ... No protocol determination is neede, if you just use double slash. Signed-off-by: Nils Bergmann <nilsbergmann@noim.io>	2019-02-16 15:32:56 +01:00
Mark Drobnak	062a180a1c	Merge pull request #2621 from cryptomilk/development-fix ... A bunch of fixes for basic-install.sh	2019-02-10 20:06:26 -05:00
Andreas Schneider	860ec1a7c4	basic_install: Use install for sudoers ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	2019-02-10 08:45:03 +01:00
DL6ER	5ca1bfc11c	Delete /dev/shm/FTL-* files on (re)start of pihole-FTL ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-08 15:00:35 +01:00
Andreas Schneider	2f189cd076	basic_install: There is no pihole group, remove it ... Only a user has been created beforehand. Only some distributions create a group with the same name based on their configuration. We cannot assume this is always the default. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	2019-02-08 08:06:12 +01:00
Andreas Schneider	2f0e6a6dda	basic_install: Make sure the PI_HOLE_CONFIG_DIR exists ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	2019-02-08 08:06:12 +01:00
Andreas Schneider	f187b42a98	basic_install: Define webroot globally as a variable ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	2019-02-08 08:06:02 +01:00
Andreas Schneider	838e1b19ec	basic_install: Set permissons for PI_HOLE_DASHBOARD_DIR ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	2019-02-06 10:41:37 +01:00
Andreas Schneider	d5bbb2b640	basic_install: Use a varibale for the pihole dashboard dir ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	2019-02-06 10:40:47 +01:00
Andreas Schneider	dc91d4b1f9	basic_install: If a static interface is already set up we are done ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	2019-02-06 07:50:21 +01:00
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
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
Mark Drobnak	f7ca74cf1d	Merge pull request #2598 from pi-hole/fix/remove-norton ... Remove Norton DNS	2019-01-19 20:52:37 -05:00