4da66313f4
Remove old test dependencies, updated ones still being used. Introduce Black formatter
2022-09-17 04:28:01 +00:00
2164220c69
Merge pull request #1204 from willman42/dev
...
init commit of Pi-hole behind Caddy example
2022-09-14 21:39:00 +01:00
798c0e606f
init commit of Pi-hole behind Caddy example
...
- Single docker compose file to spin up a Caddy and a Pi-hole container
- I put plenty of comments in compose file for user ref. Looks kinda
messy but I figured the more info the better and they can cull out
what they dont need.
- DHCP server is disabled by default in Pi-hole so I disabled the port
binding and NET_ADMIN capability by default as well, with brief
instructions and refs included.
- Caddy docker compose example ref: https://hub.docker.com/_/caddy
- Pi-hole Caddy config ref: https://docs.pi-hole.net/guides/webserver/caddy/
Signed-off-by: William Trelawny <william@trelawny.family>
2022-09-05 09:57:54 -04:00
4ddb2f817d
Merge pull request #1203 from pi-hole/master
...
sync: master to dev
2022-09-05 12:47:15 +01:00
988c39581e
Merge pull request #1202 from pi-hole/dev
...
Dev
2022-09-05 12:28:05 +01:00
2f2395e5c0
Merge pull request #1200 from willman42/dev
...
fixed broken link to TESTING.md
2022-09-05 12:27:46 +01:00
0b9e9a5af6
fixed broken link to TESTING.md
...
Signed-off-by: William Trelawny (willman42) <william@trelawny.family>
2022-09-03 18:35:43 -04:00
4a636fb7ba
Merge pull request #1198 from labodj/master
...
Remove the email function
2022-09-03 08:43:57 +01:00
540ca1e31f
Remove the email function
...
It was removed from pi-hole in 5.12 by this PR https://github.com/pi-hole/pi-hole/pull/4870
Signed-off-by: LaboDJ <2527836+labodj@users.noreply.github.com>
2022-09-03 05:31:11 +02:00
f044e58b5c
Calrifications to experimental uid/gid changer variables
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-02 23:58:53 +01:00
0d5a001916
also run remote update check on container startup
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-02 21:37:10 +01:00
9d17bd9871
Update documentation per comments on #1155
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-02 18:14:10 +01:00
de80425c87
Merge pull request #1168 from freddydumont/patch-1
...
Add systemd-resolved note for Fedora
2022-09-02 18:09:56 +01:00
b18d9bd419
Merge pull request #1193 from pi-hole/dnsmasq-listening
...
Set FTL/DNSMASQ listening behaviour per variable if it is passed/
2022-08-29 17:16:32 +01:00
0bbdd15073
Set FTL/DNSMASQ listening behaviour per variable if it is passed. Fixes #1188
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 17:12:58 +01:00
a4c931f115
Merge pull request #1192 from pi-hole/s6-wait-maxtime
...
Prevent S6 timeouts on container start by setting S6_CMD_WAIT_FOR_SERVICES_MAXTIME to 0
2022-08-29 16:52:00 +01:00
efd587bdd1
Read CAP_STR into an array and output one cap per line in startup
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 16:49:16 +01:00
27980ed9cf
Prevent S6 timeouts on container start by setting S6_CMD_WAIT_FOR_SERVICES_MAXTIME to 0, per https://github.com/just-containers/s6-overlay/issues/452
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 16:33:41 +01:00
10c33ed871
Add note to readme about installingon Dokku, closes #1190
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 14:32:14 +01:00
14c67ed729
capabilites ==> capabilities
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 13:22:50 +01:00
69f64b963e
Merge pull request #1191 from pi-hole/s6-tweaks
...
Tweaks to s6 service startup order to clarify logged output
2022-08-29 13:18:49 +01:00
97f81bae21
Shuffle some files around, change dependencies to make output clearer, change ::: for [i] to further clarify output.
...
Allow for PH_VERBOSE to set -x on all scripts that it would be useful for
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 13:17:22 +01:00
2b60df6d2b
Move uid/gid changer from legacy to new style.
...
Move deprecated dependencies file to dependencies.d for all services. Make cron depend on base
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 12:20:10 +01:00
473117e8a8
Rename start and gravity scripts to match their service names
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:50:19 +01:00
e6d4c3091f
Move all scripts to /usr/local/bin to simplify dockerfile
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:48:07 +01:00
55f4f89a0c
remove some no-longer-referenced files
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:37:42 +01:00
faffe6430f
Remove the 01-resolver-resolv file - can't track down what it does from looking at commit history - functionality is deprecated
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:21:29 +01:00
48c6192617
reintroduce ability to set verbose output
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 10:38:04 +01:00
9d0162ebcc
Merge pull request #1185 from pi-hole/tweak/PIHOLE_DNS_ARR
...
Test for empty values in the PIHOLE_DNS_ array, skip if it's empty
2022-08-27 08:16:08 +01:00
939a69b895
Test for empty values in the PIHOLE_DNS_ array, skip if it's empty
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-26 22:46:10 +01:00
1daeb117cb
Merge pull request #1183 from pi-hole/master
...
sync: master to dev
2022-08-26 22:45:52 +01:00
9039a73272
Merge pull request #1182 from pi-hole/dev
...
Dev -> Master
2022-08-26 00:23:17 +01:00
cbd86caa5b
Merge pull request #1170 from pi-hole/dependabot/pip/urllib3-1.26.5
...
Bump urllib3 from 1.25.9 to 1.26.5
2022-08-25 21:50:26 +01:00
471e0425c6
Merge pull request #1181 from pi-hole/fix-podman-issues
...
Fix issues with Podman and S6 overlay
2022-08-25 21:50:09 +01:00
8619de0031
Revert change that removed the moving of /init to /s6-init. Add comments to make sure it does not get removed again
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-25 19:31:21 +01:00
a7c7be01c1
Merge pull request #1180 from pi-hole/master
...
sync: master to dev
2022-08-25 16:13:51 +01:00
4241e50d4f
Merge pull request #1179 from pi-hole/dev
...
Dev -> Master
2022-08-25 13:41:39 +01:00
6baa4f9f08
Merge pull request #1178 from pi-hole/master
...
sync: master to dev
2022-08-25 13:40:09 +01:00
c89a55c72e
Update dependabot.yml
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-24 21:41:56 +01:00
776bac7b90
[Experimental] Move the capability setting back to bash_functions from the pihole-FTL service
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-24 21:27:38 +01:00
7ac0e8f0e3
Merge pull request #1173 from pi-hole/update-docs
...
FTLCONF_REPLY_ADDR4/6 are now deprecated. Use FTLCONF_LOCAL_IPV4/6 instead
2022-08-23 19:02:28 +01:00
a1f9601c89
Merge branch 'dev' into update-docs
2022-08-22 21:46:12 +01:00
cb38190b50
FTLCONF_REPLY_ADDR4/6 are now deprecated. Use FTLCONF_LOCAL_IPV4/6 instead
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-22 21:42:29 +01:00
8273649b5e
Merge pull request #1172 from pi-hole/master
...
sync: master to dev
2022-08-22 17:25:26 +01:00
72634fcbc2
Merge branch 'dev' into master
2022-08-22 17:22:32 +01:00
f2a84ce3dc
Remove the stuff that only runs workflows when certain files are changed - it's not working as nice as it could
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-22 17:20:00 +01:00
66aeeb8542
Merge pull request #1154 from pi-hole/master
...
sync: master to dev
2022-08-21 20:43:43 +01:00
f2d42a5b40
No need for this shim
2022-08-21 20:42:42 +01:00
33966f8eb2
Bump urllib3 from 1.25.9 to 1.26.5
...
Bumps [urllib3](https://github.com/urllib3/urllib3 ) from 1.25.9 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases )
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst )
- [Commits](https://github.com/urllib3/urllib3/compare/1.25.9...1.26.5 )
---
updated-dependencies:
- dependency-name: urllib3
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-08-21 19:32:22 +00:00
62ca934d07
Merge pull request #1169 from pi-hole/dev
...
Dev -> Master
2022-08-21 20:31:57 +01:00
Daniel
Adam Warner
William Trelawny
LaboDJ
dependabot[bot]