Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-27 00:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity
5936 commits 8 branches 109 tags 27 MiB
Commit graph

5936 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian König
5c61f6cb65
Remove checkout hint 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-14 08:43:39 +02:00
Christian König
4c0a94d2b9
Don't rely on pihole -v output but query github to get the lastest versions in debug script 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-13 14:44:13 +02:00
MichaIng
5c090d25e1
Fix ldd sh mock in tests 
Since "command" is a shell internal, it cannot be mocked, done via /usr/local/bin override. Since Debian containers ship without /bin => /usr/bin symlink, while all other containers do, the "ldd" mock needs to be applied for both paths, then.

Signed-off-by: MichaIng <micha@dietpi.com>
 2022-10-12 12:49:50 +02:00
Adam Warner
89c0706abc
master -> dev (#4970) 2022-10-12 11:32:30 +01:00
a1346054
e5695f862f
test_any_automated_install.py: Use command -v instead of which 
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2022-10-11 14:36:26 +00:00
a1346054
e3db5fc601
basic-install.sh: Use command -v instead of which 
`command -v` is the standardized version of `which` and doesn't require
any extra packages

Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2022-10-11 14:33:30 +00:00
a1346054
9c51050283
basic-install.sh: Use grep -E instead of egrep 
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2022-10-11 14:33:30 +00:00
Adam Warner
17779bad94
Pi-hole v5.13 (#4960) 2022-10-10 22:00:47 +01:00
Dan Schaper
fed58f03bf
Fix pihole -r dialog exit (#4965) 2022-10-09 21:10:23 -07:00
RD WebDesign
c5b3b8dd68
Fix pihole -r dialog exit 
- if an option is selected: Get option (repair/reconfigure);
- if exit or ESC: Get exit code (1/255)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-10-10 00:27:03 -03:00
Adam Warner
46986714d4
Bump actions/stale from 6.0.0 to 6.0.1 (#4963) 2022-10-09 20:03:21 +01:00
Adam Warner
4f3debcb5b
Bump actions/checkout from 3.0.2 to 3.1.0 (#4964) 2022-10-09 20:03:10 +01:00
dependabot[bot]
223ef72250
Bump actions/checkout from 3.0.2 to 3.1.0 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.0.2...v3.1.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-09 18:46:02 +00:00
dependabot[bot]
cf467db61d
Bump actions/stale from 6.0.0 to 6.0.1 
Bumps [actions/stale](https://github.com/actions/stale) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-09 18:45:54 +00:00
Adam Warner
fae1d13892
Add initscripts to CentOS8 dockerfile (#4966) 2022-10-09 19:45:13 +01:00
Christian König
4265bcb178
Add initscripts to CentOS8 dockerfile 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-08 22:08:39 +02:00
Christian König
9471c69882
Fix spelling 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-07 09:34:05 +02:00
Christian König
79c0b446e1
Set missing data to N/A 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 21:55:49 +02:00
Christian König
a478f2460b
POSIX 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 21:50:07 +02:00
Christian König
2dc599f266
Simplify version.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 17:58:58 +02:00
Christian König
d7f7ef9965
Only create VERSION_FILE if it does not exist 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 14:37:56 +02:00
Christian König
888e44e53d
Add hash functions to updatecheck 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 14:34:34 +02:00
Christian König
18d28533eb
Update local and remote versions at the same time 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 12:36:17 +02:00
Christian König
56527e5dd9
Add get_remote_version() to updatechecker 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 12:03:12 +02:00
Adam Warner
997a771dc8
Fix Deepsource.io warning message for index.php file (#4953) 2022-10-01 22:57:32 +01:00
Adam Warner
77f0012f6b
Fix default DHCPv4 leasetime value (#4956) 2022-10-01 22:50:39 +01:00
Adam Warner
b7b5ffa8dd
remove old code per review from @yubiuser and @dschaper 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-10-01 22:31:03 +01:00
Adam Warner
34b66002e9
leasetime (local) should have an h after it to signify 24h lease, else it will be read as two minutes (minimum integer value) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-10-01 22:31:00 +01:00
Dan Schaper
71b560667b
Add Fedora 35 and 36, remove 34 to/from the test suite (#4952) 2022-10-01 13:43:13 -07:00
Adam Warner
9dd51b79b5
Remove pihole-FTL.port file (#4945) 2022-10-01 14:30:23 +01:00
Adam Warner
7fd062c4d8
Update Amazon support URL to HTTPS in README (#4954) 2022-10-01 14:28:26 +01:00
Christian König
3731b65bd5
Remoce Fedora 34 from tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-01 10:04:26 +02:00
Christian König
6057b134ae
Add initscripts to Fedora 35 and 36 dockerfile 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-01 10:03:13 +02:00
David Beitey
0749de3d1f Update Amazon support URL to HTTPS in README 
Signed-off-by: David Beitey <david@davidjb.com>
 2022-10-01 09:39:04 +10:00
RD WebDesign
d48c557134
Fix Deepsource warning message for index.php file 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-09-30 17:13:08 -03:00
Christian König
a705fbca73
Add Fedora 35 and 36 to the test suite 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-29 19:13:23 +02:00
Christian König
276c480f50
Return default port if non-numeric characters are set in pihole-FTL.conf for FTLPORT. FTL does the same in such case and provide the API on 4711 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 23:40:09 +02:00
Christian König
25ba68104b Remove last traces 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 22:55:34 +02:00
Christian König
3d01e4d0cf No detour - use pihole-FTL.conf to get the API port number 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 22:55:30 +02:00
Adam Warner
1b0b0ca445
Update python tests and add black code formatter action (#4926) 2022-09-26 20:00:27 +01:00
Christian König
e1a2591c4d
Format test.yml 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 10:40:39 +02:00
Dan Schaper
f8a12917e2
Handle more than one default gateway in debug script (#4934) 2022-09-25 11:09:26 -07:00
Dan Schaper
37b45d411d
Read docker tag from file in root, not the previously set environment variable (#4929) 2022-09-25 11:05:08 -07:00
Christian König
22ebf21487
Use POSIX 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-25 18:20:01 +02:00
Christian König
bf5fffaca7
Better wording and test with color 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-25 18:03:44 +02:00
Adam Warner
9debd22179
If, after reading /pihole.docker.tag into DOCKER_TAG, it does not match an expected pattern, unset it - this should prevent arbitary code from being run 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-25 15:51:09 +01:00
Dan Schaper
a8ce1354c8
Set connection timeout for curl (#4884) 2022-09-24 18:19:15 -07:00
Adam Warner
0a780a959a
Fix issue in #4872 missed in review (#4940) 2022-09-24 16:18:49 +01:00
Peter Russell
951b4ed002
Remove cronjob that checks local versions every 10 minutes - only check when required (#4939) 
* eliminate updatechecker local from pihole cron job

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* resolving stickler-ci items

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* undo changes to updatecheck.sh (request from PromoFaux)

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* applied recommendation from PromoFaux

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* Indent the code inside the function

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* removed unnecessary updatecheck for core

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* eliminate updatechecker local from pihole cron job

Co-authored-by: jpgpi250 <jpgpi250@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-24 16:14:44 +01:00
Adam Warner
755ec8bf2f
$$ != $ 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-24 16:08:45 +01:00