arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 06:48:07 +00:00
Code Issues Releases Wiki Activity
4,737 Commits 9 Branches 109 Tags 20 MiB
c120f8a8d8
Commit Graph

4737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
c120f8a8d8
Revert "Include lighttpd-mod-deflate since it is no longer provided by default in Bullsye" 2021-07-02 22:09:41 +01:00
Adam Warner
0a5eee4d99
Merge pull request #4212 from lightswitch05/feature/include-lighttpd-mod-deflate 
Include lighttpd-mod-deflate since it is no longer provided by default in Bullsye
 2021-07-01 08:37:23 +01:00
Daniel
2b49988013
Include lighttpd-mod-deflate in the PIHOLE_WEB_DEPS list since it is no longer provided by default in Debian Bullseye 
Signed-off-by: Daniel <daniel@developerdan.com>
 2021-07-01 02:20:22 +00:00
Adam Warner
954b3e784f
Merge pull request #4199 from wgyt/patch-1 
Fix typo
 2021-06-30 22:38:47 +01:00
Dan Schaper
0612685fac
Merge pull request #4207 from pi-hole/fix/existing_logrotate 
Don't overwrite existing logrotate
 2021-06-21 08:23:23 -07:00
DL6ER
e3a22dcbfa
Merge pull request #4206 from pi-hole/fix/dhcpv6 
Be explicit in IPv6 RA values.
 2021-06-21 05:10:33 +02:00
Dan Schaper
4f660966d0
Shellchecker 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-06-20 11:19:19 -07:00
Dan Schaper
7df22cd8e0
Check for logroate script existing first. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-06-20 11:18:33 -07: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
William Horning
01c310a78f
Fix typo 
Signed-off-by: William Horning <williamhorning@wgyt.tk>
 2021-06-10 19:23:58 -04:00
Adam Warner
761c1cd305
Merge pull request #4175 from ashuio/development 
Added docker to README
 2021-05-20 18:49:01 +01:00
Ashutosh Verma
6f60555f79
Added install Method 3 
Signed-off-by: Ashutosh Verma <mail@ashu.io>
 2021-05-20 22:34:19 +05:30
Adam Warner
a51be7d498
Merge pull request #4153 from MichaIng/patch-2 
Re-remove wget from dependencies
 2021-05-01 00:09:19 +01:00
MichaIng
f3ceebbe06
Re-remove wget from dependencies 
The dependency has been removed here: https://github.com/pi-hole/pi-hole/pull/3185
But accidentally re-added here: 982c1b0059 (diff-595630a29a855f6d667a84ca0662042e826bf3ec56322ef61d4a6ef149147d23)

wget is still not used in any Pi-hole script, hence it can be removed safely from dependencies.

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-04-30 20:48:12 +02:00
Adam Warner
57d9b96b53
Merge pull request #4143 from pi-hole/version-fullstops 
Cosmetic change to pihole -v -c output
 2021-04-25 17:47:40 +01: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
d26f8dd665
Merge pull request #4135 from MichaIng/patch-1 
Enable PHP8 support for Debian/Ubuntu
 2021-04-21 20:19:25 +02:00
MichaIng
2ba350984f Enable PHP8 support for Debian/Ubuntu 
Since PHP8.0, the JSON extension is a core PHP extension and hence the php8.0-json package does not exist and is not required:
- https://www.php.net/manual/json.installation.php
- https://packages.debian.org/php8.0-json

Solves: https://discourse.pi-hole.net/t/php-8-packages-not-found/46286

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-04-18 15:33:05 +02:00
Dan Schaper
1fb6366c41
Merge pull request #4123 from pi-hole/master 
Master v5.3.1 to development
 2021-04-14 14:30:30 -07:00
Dan Schaper
4736e03108
Merge pull request #4122 from pi-hole/release/v5.3.1 
HotFix release v5.3.1
 2021-04-14 14:10:21 -07:00
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