4963 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Christian König	ffe45e8b76	On enabling/disabeling only reload-lists instead of reload ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-08-06 20:51:48 +02:00
Adam Warner	f86ef0128e	Merge pull request #4260 from pi-hole/tweak/installorder-butwithoutdhcpcd5-option1 ... Some tweaks to how packages are installed, plus removal of dhcpd5 dependency (Option 1)	2021-08-05 19:26:56 +01:00
Adam Warner	bdab701470	Remove dhcpcd5 dependency, however still help the user set the static IP if dhcpd5 is already installed (i.e on raspbian) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-08-05 19:02:37 +01:00
Adam Warner	1ecb9165ee	Remove weird global counter ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-08-05 19:02:37 +01:00
Adam Warner	2ff3b95117	put FTL Install back to where it was ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-08-05 19:02:37 +01:00
Adam Warner	3ad5097b12	Change initial install script order: ... 1. Ensure we have a compatible package manager 2. Install required packages for os_check to run (we need dnsutils and grep for this 3. Try to install FTL 4. FTL installed? Install installer dependencies and continue as normal - no other dependencies are installed until user has gone through all whiptails Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-08-05 19:02:37 +01:00
Adam Warner	d68a2ffaf3	Install only minimal requiered package before performing os_check ... Co-authored-by: Christian König <ckoenig@posteo.de> Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-08-05 19:02:36 +01:00
Adam Warner	913dcead7f	move chmod/chown of macvendor.db to pihole-FTL.service ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-08-05 19:02:36 +01:00
Adam Warner	1358209a9a	rename distro_check to package_manager_detect, as it is more in keeping with what the function actually does ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-08-05 19:02:36 +01:00
Dan Schaper	b729a44209	Merge pull request #4246 from pi-hole/tweak/debug_noipcheck ... Remove comparison of IP addresses with setupVars.conf	2021-08-05 09:34:08 -07:00
Adam Warner	5a55fa5e48	Merge pull request #4263 from pi-hole/tweak/debugports ... Update debug for new back end.	2021-08-05 17:12:37 +01:00
Adam Warner	d419eaf463	Merge branch 'development' into release/v5.4	2021-08-05 17:05:12 +01:00
Dan Schaper	a8deebde4d	Merge pull request #4225 from duxovni/fix-logrotate-conflict ... Give pihole its own logrotate state file	2021-08-05 09:03:47 -07:00
Dan Schaper	2ec4e84db4	Merge branch 'development' into fix-logrotate-conflict	2021-08-05 07:45:31 -07:00
Dan Schaper	075b3f6468	Remove ports, nc option and fix wording. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2021-08-04 20:57:09 -07:00
DL6ER	7911841355	Merge pull request #4262 from yubiuser/tweak_debug ... Increase width of ID column in adlist and domain table in debug script	2021-08-04 20:26:49 +02:00
Christian König	d2c75a33d5	Increase width of ID column in adlist and domain table in debug script ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-08-04 20:13:41 +02:00
Adam Warner	15dfd19f58	Merge pull request #4248 from pi-hole/tweak/debugscript ... Fix error on checking interfaces that are not dual-stack	2021-08-03 12:29:36 +01:00
DL6ER	9ae6b40818	Merge pull request #4247 from pi-hole/tweak/installLogrotateFail ... Remove extra failure display when installation of logrotate file is skipped because the file already exists	2021-07-30 07:44:34 +02:00
Christian König	aa2da80768	Remove traces of unused files ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-07-28 23:06:01 +02:00
Christian König	b05fc5bb2b	Remove specific dnsmasq config files from requiered files ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-07-28 23:01:18 +02:00
Christian König	c99c86af7f	Make all dir list output human readable ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-07-28 22:53:30 +02:00
Christian König	f552173be3	Resolve merge conflict ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-07-28 22:51:04 +02:00
DL6ER	d02aa3ced1	Fix error on checking interfaces that are not dual-stack ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-07-28 22:34:55 +02:00
DL6ER	d0eb0d5037	Remove extra failure display when installation of logrotate file is skipped because the file already exists ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-07-28 21:18:02 +02:00
DL6ER	fbfec961d5	Remove comparison of IP addresses with setupVars.conf ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-07-28 21:16:19 +02:00
DL6ER	fba7517cc6	Merge pull request #4244 from yubiuser/debug_shm ... Make output of SHM dir human readable	2021-07-28 06:20:31 +02:00
Christian König	0c125eba2c	Make output of SHM dir human readable ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-07-27 22:04:30 +02:00
DL6ER	7f4bb24fd3	Merge pull request #4242 from pi-hole/fix/guard_logrotate ... Guard for logrotate func non-zero return	2021-07-27 19:43:52 +02:00
Dan Schaper	b1ea60484e	Guard for logrotate func non-zero return ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2021-07-26 13:22:26 -07:00
MichaIng	57c40cbd09	Update pihole-FTL.service ... Make this script a bourne shell script, which requires the removal of only a single bashism, the "{n..m}" expansion. Furthermore, since POSIX echo has no reliable command line options, switch to printf when line breaks shall be omitted. On most distros/setups "sh" calls a much lighter bourne shell like dash, which inits and runs much faster than bash. Remove unused PIDFILE variable, remove the single case of FTLUSER call and remove it as well. Using variables here might give the wrong impression that there is a change these can be varied. But both are hardcoded in many places throughout Pi-hole, so in this service script. Consolidate and merge the commands to pre-create and set permissions for required files and directories. The /var/log/pihole directory is and was never used, the touch, chmod and chown call can be merged into one each to reduce overhead. Use "-f" option to to fail on missing database files instead of redirecting STDERR, which is otherwise helpful to debug other possible errors, like missing or corrupted commands, filesystem errors and such. Do not use "which pihole-FTL" when setting capabilities when the hardcoded path /usr/bin/pihole-FTL is used for the actual daemon call. It makes sense to use the full path here, as the Pi-hole installer and updater installs it explicitly there, and so we prevent users from e.g. overriding it via /usr/local/bin/pihole-FTL too easily. On pgrep and pkill calls, add the "-x" flag to assure that only "pihole-FTL" is matched and not "foo-pihole-FTL" or "pihole-FTL-bar". Do not remove possible leftovers from previous pihole-FTL processes on start, but on stop instead. Since "start" includes a proceeding "stop" as well, on service start nothing changes, but on service stop, some resources are now freed. Remove leading "$" from usage message. In bash this was omitted, as $'...' is a special syntax for escape sequence expansion, which is not applicable here. In dash it would be printed literally. To keep previous behaviour, it is hence removed. Signed-off-by: MichaIng <micha@dietpi.com>	2021-07-24 14:55:54 +02:00
Dan Schaper	95d1464e36	Merge pull request #4233 from kthchew/teleporter ... Add `-t` (teleporter) option to Admin Console help dialog	2021-07-21 10:08:31 -07:00
Kenneth Chew	092e533a30	Add -t option to Admin Console help dialog ... Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>	2021-07-18 14:31:37 -04:00
DL6ER	18c6ef8aac	Merge pull request #4230 from yubiuser/fix_coloring ... Fix coloring of pihole -t	2021-07-17 10:00:31 +02:00
Christian König	6be647a85f	Fix coloring of pihole -t ... Signed-off-by: Christian König <ckoenig@posteo.de>	2021-07-16 21:52:12 +02:00
Adam Warner	6f7edbc92e	Merge pull request #4228 from pi-hole/PromoFaux-patch-1 ... Delete supportedos.txt - it is not actually used anywhere can can cause confusion	2021-07-16 09:45:03 +01:00
Adam Warner	9beb3a9b6c	Delete supportedos.txt - it is not actually used anywhere can can cause confusion	2021-07-16 09:17:23 +01:00
Adam Warner	3b6e6317b8	Merge pull request #4126 from lightswitch05/feature/support-and-test-debian-bullseye ... Support and test Debian Bullsye (11) and Ubuntu 21.04	2021-07-15 19:11:26 +01:00
Daniel	a9b5fcd923	Add Ubuntu 21 to supportedos.txt, and github actions tests ... Signed-off-by: Daniel <daniel@developerdan.com>	2021-07-15 13:49:59 +00:00
Adam Warner	38d4b2a883	add OS_CHECK_DOMAIN_NAME override to all the dockerfiles ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-07-14 22:41:17 +01:00
Adam Warner	e2e7d0a6aa	add tests for ubuntu 21 ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-07-14 22:36:02 +01:00
Faye Duxovni	aa5c15a728	give pihole its own logrotate state file ... Signed-off-by: Faye Duxovni <duxovni@duxovni.org> Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>	2021-07-09 20:00:10 -04:00
Adam Warner	7dea5012ce	Merge pull request #4222 from pi-hole/tweak/lighttpd-config-fedora ... Remove mod_compress from lighttpd config on fedora/centos	2021-07-07 22:01:23 +01:00
Daniel	fdca19e66d	Support and test Debian Bullsye (11) ... Signed-off-by: Daniel <daniel@developerdan.com>	2021-07-07 19:09:54 +00:00
Adam Warner	c9e341b5d4	Same change as with #4221, but on fedora config too ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2021-07-07 19:20:14 +01:00
Adam Warner	012d1e4b3d	Merge pull request #4221 from lightswitch05/bugfix/remove-lighttpd-mod-compress ... Remove mod_compress (mod_deflate) from lighttpd to provide backwards compatible support for Debian Bullseye (11)	2021-07-07 19:09:22 +01:00
Daniel	31a096dec2	Remove mod_compress (mod_deflate) from lighttpd to provide backwards compatible support for Debian Bullseye (11) ... Signed-off-by: Daniel <daniel@developerdan.com>	2021-07-07 13:31:59 +00:00
DL6ER	a52a5e7ef2	Merge pull request #4217 from pi-hole/new/canary_domain_handling ... Move Mozilla canary domain handling into FTL's namespace	2021-07-04 15:36:23 +02:00
DL6ER	a0d74d1e9d	Canary domain handling is now happening in FTL where we have much finer control over it. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-07-04 13:55:47 +02:00
Adam Warner	0cbf77eb9f	Merge pull request #4131 from pi-hole/fix/gravity_no_locallist ... Handle pi.hole and hostname in FTL instead of local.list	2021-07-04 11:52:30 +01:00