gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,058 Commits 27 Branches 79 Tags
efa99a177e17b4b5f9935e0da61d665ff0411694
Commit Graph

5058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER
f0f5cc52d9 Use internal SQLite3 engine in more places in gravity.sh 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-29 22:39:45 +01:00
Lukas Schlötterer
bad6d8a59e add parameter to set filename for teleporter 
Make it possible to write pihole -a -t myname.tar.gz to configure the filename however you want

Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-01-28 16:26:57 +01:00
Christian König
7aa28e4a3a Do a full fetch 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-22 22:09:15 +01:00
Adam Warner
e80a7731c9 Merge pull request #4568 from pi-hole/master 
sync: master to development
 2022-01-16 16:26:50 +00:00
Adam Warner
3cd662eaeb Merge pull request #4558 from pi-hole/stale 
Change the exemption issue label pinned to internal for stale issues
 2022-01-16 14:59:17 +00:00
RD WebDesign
6ead24b315 Move space into variable (#4562) 
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
 2022-01-14 17:00:34 +01:00
Christian König
cdde832ed3 Some use uppercase some don't... 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-13 09:16:31 +01:00
Christian König
57ba60ce54 Change the exemption issue label pinned to internal for stale issues 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-13 09:13:40 +01:00
Lukas Schlötterer
ed6b85241b use sed substitute instead of delete and append (#4555) 
* use sed substitute instead of delete and append

doesn't move the line to the end of the file, instead keeps the order of the lines in setupVars.conf intact

Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>

* Match start of line

as suggested in the review

Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>

Co-authored-by: yubiuser <ckoenig@posteo.de>

Co-authored-by: yubiuser <ckoenig@posteo.de>
 2022-01-12 09:23:13 +01:00
Adam Warner
918f7a504c Merge pull request #4554 from pi-hole/master 
sync: master to development
 2022-01-11 19:20:18 +00:00
Adam Warner
3260cb40b5 ops per run -> 300 for stale 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-11 19:17:29 +00:00
Adam Warner
a79c1159a9 Merge pull request #4550 from pi-hole/master 
sync: master to development
 2022-01-11 09:11:51 +00:00
Adam Warner
65a04246cd Merge pull request #4548 from pi-hole/actions/sync-to-dev 
[Maintenance] Sync Master back to Dev when code is pushed to master
 2022-01-11 09:10:59 +00:00
Adam Warner
f1245685dc Add action to automatically sync master to dev when code is pushed to master 
Add in a release.yml to ignore github-actions author  when auto-generating release notes

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-11 08:53:35 +00:00
DL6ER
ec3a5c2989 Merge pull request #4543 from pi-hole/tweak/debug_ipaddr 
Include ip addr show and ip route show in debug log
 2022-01-09 12:53:37 +01:00
DL6ER
b20b38d44f Include ip addr show and ip route show for us to help with local-service issues (where hops-away is measured) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-09 12:38:22 +01:00
DL6ER
d5253f26f4 Merge pull request #4542 from pi-hole/remove_oneline 
Remove oneline from ss call
 2022-01-09 11:39:33 +01:00
Christian König
a65a841c56 Remove oneline from ss call 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-09 07:13:51 +01:00
Adam Warner
1b0b24daf5 Merge pull request #4539 from pi-hole/master 
Sync Master -> Dev
 2022-01-08 22:35:46 +00:00
Adam Warner
7010ed454c Merge pull request #4532 from MichaIng/patch-1 
Install netcat-openbsd as dependency explicitly
 2022-01-08 15:17:01 +00:00
DL6ER
ce86157067 Fix gravity in case there are no adlists at all or all are disabled (#4535) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-08 14:15:26 +01:00
Adam Warner
3097c8fbdc Skip the required ports check if installed in docker container. Unpriv'ed containers do not have access to the information required to resolve the service name listening - and the container should not start if there was a port conflict anyway (#4536) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-08 13:57:49 +01:00
Adam Warner
363e2f10bb Merge pull request #4534 from pi-hole/meta/enable_stale 
Enable Stale Action for live use
 2022-01-08 11:42:48 +00:00
Dan Schaper
bfd9fe80ef Remove debug from Stale 
Put Stale in to action.
 2022-01-08 01:42:35 -08:00
MichaIng
c2080324b7 Install netcat-openbsd as dependency explicitly 
Since Debian Stretch and Ubuntu Bionic, the "netcat" package is a transitional dummy package which pulls in "netcat-traditional" on Debian Stretch+Buster and Ubuntu Bionic, and "netcat-openbsd" on Debian Bullseye, Ubuntu Focal and up.

On Debian Bookworm (testing), however, the "netcat" package has been removed during the last 3 days at time or writing, so that it fails do be installed. While "netcat-traditional" and "netcat-openbsd" both "Provides: netcat", since it's two alternatives, APT does not automatically pick one but aborts, and the only solution is to install one explicitly.

While this is likely a temporary state of the Debian testing suite, having a closer look at the two alternatives shows that "netcat-openbsd" is a much more actively maintained newer version with additional support for IPv6, proxies, and UNIX sockets, which is likely the reason for the gradual transition via meta package from "netcat-traditional" to "netcat-openbsd". This commit hence consequently follows this aim by skipping the transitional dummy package and installing "netcat-openbsd" explicitly as dependency, to avoid any possible errors like the one which occurs currently on Bookworm.

Both packages can be installed concurrently and do no conflict, but are managed via dpkg's "update-alternatives".

For reference:
- https://packages.debian.org/netcat
- https://packages.ubuntu.com/netcat

Signed-off-by: MichaIng <micha@dietpi.com>
 2022-01-07 18:55:15 +01:00
Adam Warner
875ad04fde Merge pull request #4522 from pi-hole/development 
v5.8.1
v5.8.1 		2022-01-05 23:00:01 +00:00
Adam Warner
0124e491d0 Merge pull request #4521 from pi-hole/fix/chronometer 
Fix/chronometer
 2022-01-05 22:51:43 +00:00
Christian König
81698ef1ed Fix Pi-hole status in chronometer 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-05 21:09:57 +01:00
Adam Warner
2ff10fcd0a Merge pull request #4514 from pi-hole/development 
Pi-hole core v5.8
v5.8 		2022-01-05 18:24:21 +00:00
DL6ER
5823f5e254 Use ss instead of lsof (#4518) 
* Use ss instead of lsof for pihole status checks

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

* Use ss FILTER instead of piping into bash

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

* Use ss in debug log generation

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

* Remove lsof from dependencies

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-05 16:41:46 +00:00
Adam Warner
7807a93e10 If PIHOLE_DOCKER_TAG is set, then include that info in the debug run (#4515) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-04 21:46:06 +00:00
yubiuser
c6a2a6f739 Install pihole-FTL.conf template on fresh installation (#4496) 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-04 19:09:30 +00:00
yubiuser
241e53ed45 Skip debug upload question if called from web interface (#4494) 
* Skip debug upload question if called from web interface

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

* Suppress upload error if users opt-out from uploading from web interface

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

* Fix and reverse logic

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

* Remove addtional space

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

* Include reviewer's comment :D

Co-authored-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-04 19:06:41 +00:00
Adam Warner
d605b4b8f9 Merge pull request #4513 from pi-hole/master 
master->development
 2022-01-04 16:57:33 +00:00
yubiuser
0e359a6321 Set dnsmasq interface listening by default to local (#4509) 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-04 09:40:07 +01:00
WaLLy3K
5bd7cc9c9d Replace which with command -v (#4499) 
Signed-off-by: WaLLy3K WaLLy3K@users.noreply.github.com
 2022-01-01 18:02:20 +00:00
DL6ER
886f0c7df3 Merge pull request #4485 from pi-hole/tweak/web_status 
Return the port FTL is listening on in pihole status function
 2021-12-29 11:13:12 +01:00
Christian König
3989cc19e9 Remove double text output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 19:55:42 +01:00
Christian König
bcb59159ed Analyse port also on ports other than 53 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 19:52:11 +01:00
Christian König
2b52f92647 Inlcude port also in cli output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 19:36:32 +01:00
Matthew Nickson
71ed842dfd Fixed path to 404 file when using custom.php (#4488) 
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
 2021-12-28 19:32:06 +01:00
Christian König
f45248df80 Use FTL's new dns-port API endpoint 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 13:42:19 +01:00
Christian König
5729f64ddc Fix missing fi 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 12:21:31 +01:00
Christian König
2a869419b4 Add netcat to dependencies 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 12:18:39 +01:00
yubiuser
4a2f4c1bce Fix indention_2 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2021-12-28 12:11:46 +01:00
yubiuser
5ef731fc57 Fix indention 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2021-12-28 12:11:26 +01:00
Christian König
71ebd64f4e mend 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-26 18:13:14 +01:00
Christian König
9f0e0dbd37 Fix analyse ports 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-26 18:10:36 +01:00
Christian König
ef30a85afb Include port in status function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-26 17:10:48 +01:00
Adam Warner
1b809e4e8e Merge pull request #4480 from pi-hole/development 
Pi-hole Core v5.7
v5.7 		2021-12-22 20:24:59 +00:00