Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-26 23:00:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
5295 commits 10 branches 109 tags 28 MiB
Commit graph

1314 commits

Author SHA1 Message Date
DL6ER
be68a5339c
Apply same improvement to pihole tricorder feature 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-07 11:16:40 +02:00
DL6ER
606b05eec1
Ensure curl is either storing a valid token or a meaningful error message 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-07 11:13:09 +02:00
Christian König
6941155572 Add content of /etc/dnsmasq.conf to debug output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-09-06 17:16:36 +02:00
Christian König
6fec4acd82 Add content of /etc/resolv.conf to debug output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-09-05 20:44:39 +02:00
DL6ER
b241a19e87
Use --no-progress-meter instead of --silent so error reasons are printed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-30 21:19:47 +02:00
DL6ER
21897d7fbd
Add warning if curl failed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-30 15:55:42 +02:00
DL6ER
06fd8123c3
Also remove "rev-server" lines when rewriting 01-pihole.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-20 16:26:17 +02:00
DL6ER
c2f3477a82
Ensure conditional forwarding will forward unqualified host names if we have no local answer for them. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-20 15:54:25 +02:00
yubiuser
ee749f700f
Add switching 'to...from' message to ftl checkout output (#4266) 
* Add switching 'to...from' message to ftl checkout output

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add quotes

Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-08-07 20:07:45 +02:00
yubiuser
bb7c7cdf33
Add uptime to debug log (#4265) 
* Add uptime to debug log

Signed-off-by: Christian König <ckoenig@posteo.de>

* Address github comments

Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-08-07 20:07:14 +02: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
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
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
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
fbfec961d5
Remove comparison of IP addresses with setupVars.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-28 21:16:19 +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
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
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
Daniel
fdca19e66d Support and test Debian Bullsye (11) 
Signed-off-by: Daniel <daniel@developerdan.com>
 2021-07-07 19:09:54 +00: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
Adam Warner
e80e54a61a
head_line -> line 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-04 01:18:46 +01:00
Adam Warner
9b9e907013
Merge branch 'development' into debug_tail_log 2021-07-04 00:53:14 +01:00
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist 2021-07-04 00:48:09 +01:00
Adam Warner
a1d85155fd
Merge pull request #4178 from pi-hole/fix/custom_dns_removal 
Add missing sed anchors when deleting lines.
 2021-07-04 00:35:00 +01:00
Dan Schaper
01764cc581
Explicity declare values for the RA packet. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-06-20 10:28:25 -07:00
Christian König
08cf9aa5a7 Declare and assign 'logging_enabled' separately 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-06-19 12:25:38 +02:00
Christian König
1ae67e1de8 Only inform user about disabled logging, don't skipp printing pihole.log 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-06-19 12:25:38 +02:00
Christian König
f2cba6cad1 Skip analyze_pihole_log if query logging has been disabled 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-06-19 12:25:38 +02:00
Christian König
df3c46349a Add tail of pihole.log to debug output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-06-19 12:25:38 +02:00
DL6ER
a9e761ec13
Add missing sed anchors when deleting lines. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-05-23 12:11:04 +02:00
Adam Warner
5895690b58
this has been annoying me for months 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-04-24 15:38:27 +01:00
DL6ER
3b574096b8
Remove duplicated lo test 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-16 12:28:00 +02:00
DL6ER
58905a1188
Modify debugger to test name resolution on all available interfaces 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-16 12:14:05 +02:00
Adam Warner
b388ac5bb5
Merge pull request from GHSA-3597-244c-wrpj 
Add some validation to passed arguments before running the values through `sed`
 2021-04-14 18:16:46 +01:00
Adam Warner
45d4ab4c22
Add some validation to passed arguments before running the values through sed 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-03-19 18:39:43 +00:00
DL6ER
f536718aaa
Use possibly custom gravity.db location in the copying SQL script 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-03-18 16:46:59 +01:00
DL6ER
f1740da9ff
Update gravity path in query.sh 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-03-18 09:58:19 +01:00
DL6ER
9bdbe88a66
Update gravity path in list.sh 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-03-18 09:58:19 +01:00
Dan Schaper
f27fd9f899
Merge pull request #3982 from andras-tim/list-fix-same-wildcard-regex 
Fix list: User same wildcard regex that the UI use
 2021-03-17 11:20:12 -07:00
DL6ER
57fe3b6621
Merge pull request #3951 from pi-hole/new/gravity_adlist_infos 
Store gravity details in gravity.db adlist table
 2021-02-28 17:01:19 +01:00
Christian König
78027bd2bf Add default noname if hostname is empty 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-02-12 20:25:01 +01:00
Christian König
7dc7cbb80e Add hostname to teleporter backup file if called from cli 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-02-11 19:45:32 +01:00
Alexander Schmitz
1ab193fa9d
Update piholeDebug.sh 
Signed-off-by: Alexander Schmitz <Flashbang007@gmail.com>
 2021-01-27 11:00:43 +01:00
freddii
7c0c30fb0b fixed typos 2021-01-19 19:33:38 +01:00
Andras Tim
bfee230c79 scripts/list: User same wildcard regex that the UI use 
The CLI and the UI should do the same to be able to add/remove the same
records via any supported interface.

Signed-off-by: Andras Tim <andras.tim@gmail.com>
 2021-01-11 17:05:17 +01:00
DL6ER
1791fe22f6
Merge pull request #3912 from mdujava/basic_auth 
Fix validation of adlist url
 2020-12-31 12:19:32 +01:00
DL6ER
e033ee6664
Fix connection mechanism between Chronometer and FTL 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-29 10:29:02 +01:00
DL6ER
6b33b8b4c0
Store status of downloaded list (downloaded, using cache, some error, ...) and number of (in-)valid domains on this list in the gravity database. This updates the gravity databaes to version 14. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-28 08:08:49 +01:00
Matej Dujava
ef0bdf6470 Fix validation of adlist url 
Already existing regex validation will be used on url after removing @ (in case
its in separating userinfo and host).

Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
Fixes: https://github.com/pi-hole/pi-hole/issues/3911
Fixes: 7d19ee1b: validate blocklist URL before adding to the database (#3237)
 2020-12-21 12:50:02 +01:00
DL6ER
41479524f8
Merge pull request #3900 from ganto/fix/chrono-non-lte 
Fix chronometer output if web interface is not installed
 2020-12-12 10:08:05 +01:00
Adam Warner
357b6702ec
Update advanced/Scripts/chronometer.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-11 12:30:52 +00:00
DL6ER
78cdd34992
Merge pull request #3904 from ganto/fix/debug-non-web-2 
piholeDebug: Diagnose output if (Web) git directory is not found
 2020-12-10 23:00:45 +01:00
Reto Gantenbein
9dc539c98b piholeDebug: More detailed diagnostics if Web interface is not found 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 18:46:11 +01:00
Reto Gantenbein
18e4eb460c piholeDebug: Fix version check if lighttpd/php are not installed 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 14:11:53 +01:00
Reto Gantenbein
e841347057 Fix chronometer output if web interface is not installed 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 02:55:55 +01:00
Adam Warner
8443262214
Merge pull request #3890 from ganto/fix/x86-64-arch 
Ensure x86_64 processor architecture is listed as supported
 2020-12-02 21:12:18 +00:00
DL6ER
36937b1913
Strip such lines starting with a #. Do not silently truncate lines if they have a # somewhere in between (like server=127.0.0.1#5353) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-02 20:52:39 +01:00
Reto Gantenbein
d0af1a950b Ensure x86_64 processor architecture is listed as supported 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-02 20:44:11 +01:00
DL6ER
a217c75134
Merge pull request #3882 from pi-hole/tweak/conditional_transforms 
Fix processing of CONDITIONAL_FORWARDING_REVERSE
 2020-12-01 18:46:54 +01:00
Adam Warner
454c9a411c
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:36 +00:00
Adam Warner
f44b2f6aa3
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:21 +00:00
DL6ER
49810262db
When there is a Pi-hole domain set and "Never forward non-FQDNs" is ticked, we add to tell FTL that this domain is purely local and FTL may answer queries from /etc/hosts or DHCP but should never forward queries on that domain to any upstream servers 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-01 09:16:50 +01:00
Adam Warner
58bc98ca44
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 22:30:59 +00:00
Adam Warner
4093959d3e
Appease stickler 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:55:07 +00:00
Adam Warner
06c5fe2a89
Set REV_SERVER_CIDR in the else condition if it is not in-addr.arpa 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:29:54 +00:00
Adam Warner
6cb8f3f403
Add some comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:18:25 +00:00
Adam Warner
e004d27b28
Fix processing of CONDITIONAL_FORWARDING_REVERSE 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 18:58:23 +00:00
Adam Warner
d2e9a20d96
Merge pull request #3859 from yubiuser/tweak/debug_pihole-FTL_status 
Add systemctl status --full --no-pager pihole-FTL.service to the debug log
 2020-11-28 16:58:23 +00:00
DL6ER
d4c33e5188
Include the raw messages from the Pi-hole diagnosis systems in debug logs 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-24 16:06:45 +01:00
Christian König
70c48afc04 Add else statement 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-24 06:02:18 +01:00
Christian König
ec5183b553 Rename function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-24 05:57:13 +01:00
Christian König
50316ee617 Add systemctl status --full --no-pager pihole-FTL.service to the debug log 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-23 21:09:35 +01:00
Adam Warner
1c2c10c4a5
Merge pull request #3761 from BastiG/development 
read REV_SERVER_CIDR from environment
 2020-11-18 21:56:08 +00:00
Adam Warner
cd8120d33f
Add some output to the --nuke command 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-16 23:31:35 +00:00
Adam Warner
4abd8196ae
Merge pull request #3349 from Forceflow/development 
Fix for pihole -w --nuke displaying help info even if command is exec…
 2020-11-08 16:10:47 +00:00
DL6ER
50100017a5
Merge pull request #3794 from pi-hole/security/non_FQDNs_locality 
Security enhancement for the "never forward non-FQDNs" feature
 2020-10-21 21:09:05 +02:00
Adam Warner
59b0a6af6f
Remove references to privacy level 4 (no longer functional) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-13 23:53:23 +01:00
bcambl
47aa1644a8 add debug checking for firewalld 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-11 22:20:31 -06:00
DL6ER
08a84e51d6
Only add local=/<domain>/ when the "only forward FQDN queries" function is enabled to prevent unintended side-effects of this change 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-10-10 11:23:55 +02:00
DL6ER
d631cd8b04
Security enhancement for the "never forward non-FQDNs" feature. This should prevent all local queries from being forwarded (will show up as blocked by regex) as well as any hostname without a domain (for example one word searches from the address bar in browsers). This fixes #3303 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-10-10 11:01:01 +02:00
Adam Warner
0445559610
Accidentally a number (#3788) 
Co-authored-by: MichaIng <micha@dietpi.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: MichaIng <micha@dietpi.com>
 2020-10-09 17:24:42 +02:00
Adam Warner
948337dd8e
Merge pull request #3740 from pi-hole/new/adlist_date_updated 
Add date_updated field to adlist table
 2020-10-09 14:04:13 +01:00
Adam Warner
fe463f15b3
Merge pull request #3741 from pi-hole/new/debug_scan_dhcp 
Discover active DHCP servers during debugger run
 2020-10-09 14:00:57 +01:00
Christian König
568ebd67ca Update comment 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-10-03 16:17:37 +02:00
Christian König
c628c970ae Print tail of logs in /var/log/lighttpd in debug run as well 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-10-02 21:04:27 +02:00
Sebastian Gmeiner
8041bbf443 read REV_SERVER_CIDR from environment 
Signed-off-by: Sebastian Gmeiner <sebastian@gmeiners.net>
 2020-09-25 15:26:43 +02:00
DL6ER
41e899260f
Discover active DHCP servers during debugger run 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-09-07 23:17:50 +02:00
DL6ER
12b9748c43
Fine-tune adlist:adte_modified trigger and don't default new date_updated column to now but use NULL instead 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-09-07 21:11:57 +02:00
DL6ER
4fd412d7c3
Add date_updated field in adlist table set when a list changes. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-09-07 20:59:23 +02:00
Adam Warner
b8cd238fa1
Update advanced/Scripts/piholeDebug.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-08-23 14:35:02 +01:00
Adam Warner
8e219cb799
Make output more meaningful in case of dig failure. 
Include dig return code and response in debug run

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-08-23 10:48:15 +01:00
Dan Schaper
ebdb68a47a
display_warning fixes 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-08-15 10:54:31 -07:00
Dan Schaper
623ce1fe18
Tabs and debug.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-08-14 14:37:58 -07:00
Adam Warner
bb1a6243d6
Merge pull request #3669 from pi-hole/release/v5.1.2 
Release/v5.1.2 to development
 2020-08-14 16:28:53 +01:00
Samuel Boucher
d4dd446ba3 Update advanced/Scripts/chronometer.sh 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Samuel Boucher <scboucher@users.noreply.github.com>
 2020-08-09 17:12:20 -04:00
Samuel Boucher
8b4921405a Upercase the temp_unit 
Signed-off-by: Samuel Boucher <scboucher@users.noreply.github.com>
 2020-08-09 15:09:49 -04:00
Aiden Mitchell
7c53b97004
Updating FAQ_HARDWARE_REQUIREMENTS and FAQ_HARDWARE_REQUIREMENTS_PORTS (#3632) 
Signed-off-by: Aiden Mitchell <aiden@bcyouthcouncil.ca>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-30 12:57:19 -07:00
Adam Warner
f50cff54de
*innocent whistling* 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 23:49:17 +01:00
Adam Warner
849139176e
fallback to NC if curl fails on uploadgit checkout 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 21:54:45 +01:00
Adam Warner
b8bba7951f
Just one more newline, give it to me. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 20:49:18 +01:00
Adam Warner
76ce5ec66b
Add additional information about local debug log location 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 20:45:02 +01:00
Adam Warner
7b41b99549
Merge pull request #2887 from tlk/fix/reenable 
Prevent "pihole disable $timeout" from messing up future state changes
 2020-07-15 20:23:33 +01:00
XhmikosR
d8822b70cf Fix minor typo 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-07-05 15:12:02 +03:00
Adam Warner
3205606fc3
Also validate IPV6 in the setdns function 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-23 20:38:18 +01:00
Dan Schaper
3aaf9d89b3
Merge pull request #3260 from pi-hole/new/rev-server 
Improve conditional forwarding
 2020-06-21 13:26:07 -07:00
DL6ER
2c3aa9ab00
Merge pull request #3491 from pi-hole/fix_ip_address_section 
Fix fresh install on dev branch not working
 2020-06-21 21:58:36 +02:00
DL6ER
9bf0f2a161
Reduce handholding when trying to foresee the intentions of the user. The code does now preserve legacy behavior and users can open up the subnet manually if they like. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-21 21:47:30 +02:00
Adam Warner
7ea6d7b92b
remove ; so IFS changes don't stick 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-14 00:17:51 +01:00
Adam Warner
011fa8c6ea
fix sticklr complaint 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 21:47:00 +01:00
Adam Warner
0320d85028
Additionally source the install script in webpage.sh to validate IP entered on pihole -a setdns 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 20:57:57 +01:00
Dan Schaper
5f9dac8d2b
Merge pull request #3434 from pi-hole/new/os_detect 
Change OS Detection in debug script
 2020-06-05 13:38:50 -07:00
Adam Warner
03a8cff55e
read > mapfile as suggested by @dschaper 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-05 21:01:53 +01:00
DL6ER
2b1bc6a46e
Replace possible "\#" by "#". This fixes AdminLTE#1427 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 09:32:40 +02:00
DL6ER
6160eb6894
This regex is too complex for bash's own replacement. Add ignore for the shellcheck rule. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 09:22:40 +02:00
DL6ER
318ca75269
Merge branch 'development' into new/rev-server 2020-06-04 08:56:08 +02:00
Adam Warner
58724a38a9
Improve detection and display of supported/unsupported OS in debug script 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-03 17:57:22 +01:00
XhmikosR
7579ab178a Update links 
* use https when possible
* replace coverage with a link to the docs page in README.md
* remove obsolete affiliate link in README.md

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 21:50:16 +03:00
Thomas L. Kjeldsen
903808a477 Improved explanation of why this script is needed 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 03:14:03 +02:00
Thomas L. Kjeldsen
005da06b3d Use PI_HOLE_BIN_DIR as introduced in PR #2886 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 03:13:51 +02:00
Thomas L. Kjeldsen
852f6b95f5 Prevent "pihole disable $timeout" from messing up future state changes 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 02:58:27 +02:00
DL6ER
b60ec8a48f
Merge pull request #3248 from MichaIng/patch-8 
Start pihole-FTL after network
 2020-05-25 21:27:27 +02:00
DL6ER
27f0fd2372
Merge pull request #3415 from fhriley/reload_privacy 
Reload the lists, which will cause the cached privacy level to be upd…
 2020-05-25 18:47:44 +02:00
Adam Warner
d0e250a616
Ensure pihole-FTL.conf is parsed, as well as external.conf for lighttpd, to rule out any custom modifications. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-21 22:25:00 +01:00
Adam Warner
b2ba55c27b
Show details of any remotes on the git repositories 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-21 21:23:26 +01:00
Frank Riley
9d04c517e6 Reload the lists, which will cause the cached privacy level to be updated. 
Signed-off-by: Frank Riley <fhriley@gmail.com>
 2020-05-20 15:47:53 -07:00
DL6ER
b421e422c2
Merge pull request #3351 from marank/development 
Added support for CNAME record add/remove
 2020-05-20 09:13:54 +02:00
MichaIng
5c17e41cf1 Start pihole-FTL after network 
"$network" on a systemd-driven OS leads to "After=network-online.target" in the generated systemd unit.
This target is no guarantee that all network interfaces have been fully configured, as it depends on the related network services types, but at least it reduces the risk that those have not fully finished their job when pihole-FTL starts. If this is the case, certain issues can occur:
- https://github.com/pi-hole/pi-hole/issues/2924
- https://discourse.pi-hole.net/t/have-to-pihole-restartdns-after-reboot/28772

Runtime files are now consistently created in "/run" instead of "/var/run". The second is a symlink to the first for backwards compatibility but on none-ancient distro versions one should use "/run", systemd even prints a warnings if service files use "/var/run". The service file used "/run" and "/var/run" both, in cases for the same files/directories before, which does not directly cause issues currently, due to the symlink, but is inconsistent at best.

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-05-16 13:38:18 +02:00
Dan Schaper
c76435883b
Merge pull request #3360 from dnicolson/fix-github-capitalisation 
Fix GitHub capitalisation
 2020-05-13 16:56:36 -07:00
Dave Nicolson
ab753e88a2 Fix GitHub capitalisation 
Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>
 2020-05-13 12:55:00 +02:00
Adam Warner
be25b4d9c4
Merge pull request #3352 from pi-hole/merge-master-dev 
Merge master dev
 2020-05-12 22:27:24 +01:00
Adam Warner
9e96ff37de
Fix merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 22:16:43 +01:00
DL6ER
a9c66c7b45
Implement pihole -a theme option 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 23:03:49 +02:00
Matthias Rank
2b9898e9ca Fixed indentation 
Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-05-12 21:04:30 +02:00
Matthias Rank
0add5eb291 Added support for CNAME record add/remvoe 
Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-05-12 21:02:29 +02:00
Jeroen Baert
4cf241b42b Fix for pihole -w --nuke displaying help info even if command is executed correctly 
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>
 2020-05-12 19:59:19 +02:00
DL6ER
7cc35d3b04
Add update to gravity database version 12, renaming the Unassociated group to Default group. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-07 18:01:37 +02:00
DL6ER
78469ee58d
Merge pull request #3255 from pi-hole/tweak/emailregex 
Enhanced email validation regex
 2020-05-06 09:48:26 +02:00
Adam Warner
369288cc48
Update advanced/Scripts/webpage.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-05-06 08:40:54 +01:00
Dan Schaper
017d405b28
Merge pull request #3307 from pi-hole/tweak/debugger_type_display 
Improve debugger database table printing
 2020-04-29 11:48:47 -07:00
DL6ER
ddb354f78b
Add enable indentation for the domainlist 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-29 06:23:29 +02:00
DL6ER
20ef5e0264
Show associated group IDs in domains/clients/adlists listing. We get the data through a LEFT JOIN followed by a GROUPing by the left list ID and finialized through a GROUP_CONCATenation. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-24 10:33:46 +02:00
DL6ER
ad5802715e
enabled field: Center 0, right-align 1 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 15:16:48 +02:00