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
Adam Warner
1c1407e083
Use utils.sh in install script ( #4872 )
2022-09-24 14:00:22 +01:00
Adam Warner
9463c3c69f
Change wording in chronometer ( #4910 )
2022-09-24 13:53:08 +01:00
Adam Warner
54bcf5626f
Bump actions/stale from 5.2.0 to 6.0.0 ( #4938 )
2022-09-24 13:07:51 +01:00
dependabot[bot]
ba8a50c829
Bump actions/stale from 5.2.0 to 6.0.0
...
Bumps [actions/stale](https://github.com/actions/stale ) from 5.2.0 to 6.0.0.
- [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/v5.2.0...v6.0.0 )
---
updated-dependencies:
- dependency-name: actions/stale
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-09-24 10:08:26 +00:00
Christian König
bb57a9e616
Handle more than one default gateway in debug script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-22 22:33:11 +02:00
yubiuser
4f4dfe3ac0
Fix tabs in dialog boxes ( #4932 )
2022-09-22 22:02:45 +02:00
Christian König
d4ce5b1c2a
Fix tabs in dialog boxes
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-22 14:49:25 +02:00
Adam Warner
b6d1bd7335
Read docker tag from file in root, not the previously set environment variable
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-19 22:01:05 +01:00
Christian König
17ec88d96f
Remove installed_binary variable which was leftover from https://github.com/pi-hole/pi-hole/pull/4893
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-19 14:50:35 +02:00
Christian König
0df38cd64e
Format all /test files with black
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-19 14:50:35 +02:00
Christian König
0932c5c498
Add black python code formatter action
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-19 14:50:35 +02:00
Christian König
73ca4ebdbc
Update test requirements
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-19 14:50:35 +02:00
Adam Warner
da6596e516
Master -> Dev ( #4925 )
2022-09-19 11:15:59 +01:00
Adam Warner
d88629e23f
v5.12.2 ( #4922 )
2022-09-19 11:00:09 +01:00
yubiuser
d581401f4e
Fix gravity database integrity check ( #4921 )
2022-09-18 13:35:03 +02:00
Christian König
60c35cb93c
Remove unused check_database_integrity()
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-18 13:08:44 +02:00
Christian König
2c3fea321b
Remove FAQ_ULA as it is unused in core
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-18 09:10:24 +02:00
Christian König
40f00c6f0b
Fix gravity database integrity check
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-18 09:01:22 +02:00
Christian König
00e51f32b5
Blcked => Block
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-17 16:46:31 +02:00
Christian König
f90fb8b946
Change wording in chronometer
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-17 16:24:31 +02:00
yubiuser
2ff1fa1b85
Merge branch 'development' into use_utils
2022-09-17 16:14:31 +02:00
yubiuser
7eff36b3bb
Update workflow python to 3.10 and allow any python3 version in tests ( #4914 )
2022-09-17 16:13:48 +02:00
yubiuser
5332b31b92
Add comment in lighttpd.conf how to change the server port ( #4917 )
2022-09-17 14:05:13 +02:00
yubiuser
16640ee174
Bump actions/stale from 5.1.1 to 5.2.0 ( #4918 )
2022-09-17 14:04:25 +02:00
dependabot[bot]
5fe170666a
Bump actions/stale from 5.1.1 to 5.2.0
...
Bumps [actions/stale](https://github.com/actions/stale ) from 5.1.1 to 5.2.0.
- [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/v5.1.1...v5.2.0 )
---
updated-dependencies:
- dependency-name: actions/stale
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-09-17 10:08:40 +00:00
Christian König
7e6f81f814
Add comment in lighttpd.conf how to change the server port
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-17 12:00:33 +02:00
yubiuser
80c770357c
Fixing texts forgotten after Blocking Page removal ( #4915 )
2022-09-16 08:25:15 +02:00
RD WebDesign
5cc317de5b
Change texts after Block Page removal
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-09-16 03:16:54 -03:00
Adam Warner
515e5f8c8a
Store docker version in versions file (If PIHOLE_DOCKER_TAG variable is set) ( #4913 )
2022-09-15 18:05:42 +01:00
Adam Warner
3d53bda121
Update advanced/Scripts/updatecheck.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-09-15 17:54:54 +01:00
Christian König
8bc5b16527
Set tox envlist to py3
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-15 13:55:45 +02:00
Christian König
c1a927fff1
Run test workflows on python 3.10
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-15 13:55:45 +02:00
Adam Warner
760325eb76
Update piholeDebug to source versions file for DOCKER_VERSION instead of reading PIHOLE_DOCKER_TAG
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-14 22:49:37 +01:00
Adam Warner
bf256aa5a7
If docker version env var is set, store it in /etc/pihole/versions file for later use
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-14 22:38:41 +01:00
Adam Warner
8dbe6fc0b7
master-> Dev ( #4912 )
2022-09-14 22:08:15 +01:00
Adam Warner
fe8b0e98ab
v5.12.1 ( #4908 )
2022-09-14 21:28:44 +01:00
