arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity
4,767 Commits 9 Branches 109 Tags 20 MiB
31a096dec2
Commit Graph

4767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Schaper
18bedc0493
Merge pull request #4121 from pi-hole/fix/port_hash 
Fix port separator in IPv4 address validation code
 2021-04-14 13:59:52 -07:00
DL6ER
74948ae5c1
The correct port separator is '#' not ':' in dnsmasq style. This should not have been changed in #4083 in the first place. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-14 22:53:12 +02:00
Dan Schaper
9b57f7fa33
Merge pull request #4120 from pi-hole/fix/splashPage 
Add missing closing single quote
 2021-04-14 13:50:45 -07:00
Dan Schaper
866045968d
Add missing closing single quote 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-04-14 12:27:36 -07:00
Dan Schaper
f2e0cf8a92
Merge pull request #4117 from pi-hole/master 
v5.8 master to dev
 2021-04-14 12:24:08 -07:00
Adam Warner
4c39edbeb9
Merge pull request #4113 from pi-hole/release/v5.3 
Pi-hole Core v5.3
 2021-04-14 19:04:03 +01: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
7855859726
Merge pull request #4116 from pi-hole/fix/update-readme 
Update README
 2021-04-14 17:57:47 +01:00
DL6ER
5df7ed2f32
Obtain FTL's PID from the PID file (#4103) 
* Try to obtain FTL's PID from the PID file. If this fails, try to identify the main process using pgrep --oldest (instead of relying on pkill finding the right one by itself). This allows the script to work in even when FTL is running inside the memory checker valgrind.

* Rename FTL_PID -> FTL_PID_FILE

* Remove the pgrep fallback after discussions about that it should be more obvious to users if something strange happened to their PID file. Also, simplify the routine using a bashism in the end.

* Shorten if [[ regex ]]

* Use unset instead of emptying the PID variable

Signed-off-by: DL6ER <dl6er@dl6er.de>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-04-14 09:33:10 -07:00
Dan Schaper
25ded79190
Update README 2021-04-14 09:26:52 -07:00
Adam Warner
d3e00f038b
Merge pull request #4004 from pi-hole/fedora_33_support 
Fedora 33 Support
 2021-04-13 08:41:56 +01:00
bcambl
d5f13018a7 Merge branch 'release/v5.3' into fedora_33_support 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-04-12 20:06:11 -06:00
Adam Warner
c6e3805bbb
Merge pull request #4083 from jbzdarkid/patch-2 
Improve regexes for IPv4 matching
 2021-04-12 21:12:20 +01:00
Adam Warner
ea451e3c22
Merge pull request #4095 from jbaez/ft-3896 
Fix error trying to access undefined variables on splash page.
 2021-04-12 20:41:25 +01:00
DL6ER
b97f890a8c
Merge pull request #4086 from pi-hole/fix/GRAVITDB_in_pihole-g 
pihole -g should respose GRAVITYDB in pihole-FTL.conf
 2021-04-11 05:18:09 +02:00
Jaime Baez
6198165df8 Fix error trying to access undefined variables on splash page. 
Signed-off-by: Jaime Baez <j.baezcastillo@gmail.com>
 2021-03-26 23:42:11 +01:00
jbzdarkid
8090071eff Update regex to disallow leading zeros 
Also updated a comment to point to a non-experimental RFC.

Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-03-21 16:27:08 -07:00
Joseph Blackman
89c80947df Improve regexes for ipv4 matching 
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-03-21 16:24:35 -07:00
Adam Warner
b51751e892
Merge pull request #4084 from jbzdarkid/patch-1 
Improve comments in basic-install.sh
 2021-03-21 23:14:59 +00: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
DL6ER
d25240fe9f
pihole -g should respose GRAVITYDB in pihole-FTL.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-03-18 09:00:27 +01:00
jbzdarkid
20b6f9cceb Improve comments in basic-install.sh 
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-03-17 18:37:18 -07: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
Dany
13cf0c1288
Aligned pihole logo to center, Fixed responsive issue (#4036) 
* Aligned pihole logo to center, Fixed responsive issue

* removed duplicate instance of #splashpage

Signed-off-by: Dany Gauthier <danygauthier57@yahoo.ca>
 2021-03-17 11:18:50 -07:00
Adam Warner
ae762574e5
Merge pull request #4070 from pi-hole/fix/pihole-g-r 
Fix `pihole -g -r`
 2021-03-03 14:43:42 +00:00
DL6ER
126b9ae381
Add missing three new columns to pihole -g -r 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-03-02 20:08:09 +01: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
Adam Warner
56fa9714b5
Merge pull request #4010 from mtzfederico/master 
Updates lighttpd config to allow a persistent port change on IPv6
 2021-02-28 14:42:21 +00:00
Dan Schaper
03a8ca5c1b
Merge pull request #4049 from yubiuser/tewak/teleporter_cli 
Add hostname to teleporter backup file if called from cli
 2021-02-16 08:02:49 -08: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
Dan Schaper
debc9a69c5
Merge pull request #4021 from Flashbang007/patch-3 
Fix issue with multipe default gateways when running the debug
 2021-01-27 08:45:22 -08:00
Alexander Schmitz
1ab193fa9d
Update piholeDebug.sh 
Signed-off-by: Alexander Schmitz <Flashbang007@gmail.com>
 2021-01-27 11:00:43 +01:00
Adam Warner
9ec012289f
Merge pull request #4017 from mwoolweaver/patch-2 
fix suspected typo in comment
 2021-01-26 08:48:05 +00:00
Michael Woolweaver
c42b97ddb2
fix typo in comment 
Signed-off-by: Michael Woolweaver <m.woolweaver@icloud.com>
 2021-01-26 01:04:37 -06:00
mtzfederico
e5bfafefb9 Moved where external.conf is included 
Signed-off-by: mtzfederico <fm@mtzfederico.com>
 2021-01-22 15:53:40 -06:00
bcambl
b62495d89e update tests to fedora 33 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-01-21 20:20:07 -06:00
bcambl
c6810a0124 touch sysconfig network script when absent 
sysconfig network scripts are missing on pure NetworkManager installs.
This commit touches a placeholder to allow the network configuration to
be generated and loaded via NetworkManager.

Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-01-19 23:06:39 -06:00
Adam Warner
8e7670db41
Merge pull request #4002 from freddii/master 
fixed typos
 2021-01-19 18:46:55 +00:00
freddii
7c0c30fb0b fixed typos 2021-01-19 19:33:38 +01:00
Adam Warner
cbfb58f7a2
Merge pull request #4000 from pi-hole/release/v5.2.4 
Pi-hole Core v5.2.4
 2021-01-19 12:29:01 +00:00
Adam Warner
0c45d23c22
Merge pull request #3997 from pi-hole/revert-3537-patch-2 
Revert "Further failsafe check for available APT packages"
 2021-01-19 08:19:46 +00:00
Dan Schaper
3f8fedfb16
Revert "Further failsafe check for available APT packages" 2021-01-17 11:10:24 -08:00
Adam Warner
cbc3fbdfe6
Merge pull request #3989 from pi-hole/release/v5.2.3 
Pi-hole Core v5.2.3
 2021-01-15 19:45:55 +00:00
Dan Schaper
020b6b8064
Merge pull request #3987 from pi-hole/fix/GitHubAPI 
Use the 'Location:' header only for latest FTL tag API check.
 2021-01-13 09:38:09 -08:00
Dan Schaper
523f650157
Use the 'Location:' header only. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-01-12 13:42:51 -08: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