Commit Graph

1459 Commits

Author SHA1 Message Date
William Trelawny (willman42) 0b9e9a5af6 fixed broken link to TESTING.md
Signed-off-by: William Trelawny (willman42) <william@trelawny.family>
2022-09-03 18:35:43 -04:00
Adam Warner 4a636fb7ba
Merge pull request #1198 from labodj/master
Remove the email function
2022-09-03 08:43:57 +01:00
LaboDJ 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
Adam Warner 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
Adam Warner 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
Adam Warner 9d17bd9871
Update documentation per comments on #1155
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-02 18:14:10 +01:00
Adam Warner de80425c87
Merge pull request #1168 from freddydumont/patch-1
Add systemd-resolved note for Fedora
2022-09-02 18:09:56 +01:00
Adam Warner 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
Adam Warner 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
Adam Warner 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
Adam Warner 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
Adam Warner 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
Adam Warner 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
Adam Warner 14c67ed729
capabilites ==> capabilities
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 13:22:50 +01:00
Adam Warner 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
Adam Warner 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
Adam Warner 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
Adam Warner 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
Adam Warner 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
Adam Warner 55f4f89a0c
remove some no-longer-referenced files
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:37:42 +01:00
Adam Warner 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
Adam Warner 48c6192617
reintroduce ability to set verbose output
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 10:38:04 +01:00
Adam Warner 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
Adam Warner 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
Adam Warner 1daeb117cb
Merge pull request #1183 from pi-hole/master
sync: master to dev
2022-08-26 22:45:52 +01:00
Adam Warner 9039a73272
Merge pull request #1182 from pi-hole/dev
Dev -> Master
2022-08-26 00:23:17 +01:00
Adam Warner 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
Adam Warner 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
Adam Warner 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
Adam Warner a7c7be01c1
Merge pull request #1180 from pi-hole/master
sync: master to dev
2022-08-25 16:13:51 +01:00
Adam Warner 4241e50d4f
Merge pull request #1179 from pi-hole/dev
Dev -> Master
2022-08-25 13:41:39 +01:00
Adam Warner 6baa4f9f08
Merge pull request #1178 from pi-hole/master
sync: master to dev
2022-08-25 13:40:09 +01:00
Adam Warner c89a55c72e
Update dependabot.yml
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-24 21:41:56 +01:00
Adam Warner 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
Adam Warner 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
Adam Warner a1f9601c89
Merge branch 'dev' into update-docs 2022-08-22 21:46:12 +01:00
Adam Warner 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
Adam Warner 8273649b5e
Merge pull request #1172 from pi-hole/master
sync: master to dev
2022-08-22 17:25:26 +01:00
Adam Warner 72634fcbc2
Merge branch 'dev' into master 2022-08-22 17:22:32 +01:00
Adam Warner 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
Adam Warner 66aeeb8542
Merge pull request #1154 from pi-hole/master
sync: master to dev
2022-08-21 20:43:43 +01:00
Adam Warner f2d42a5b40
No need for this shim 2022-08-21 20:42:42 +01:00
dependabot[bot] 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
Adam Warner 62ca934d07
Merge pull request #1169 from pi-hole/dev
Dev -> Master
2022-08-21 20:31:57 +01:00
Frédérick Morin 31cd4fbc47
Add systemd-resolved note for Fedora
Fedora 33+ enables [systemd-resolved by default](https://fedoraproject.org/wiki/Changes/systemd-resolved), so the "Installing on Ubuntu" section becomes relevant for Fedora users as well.

This small change makes it possible to search the Readme for "Fedora" and find the solution instantly.

Signed-off-by: Frédérick Morin <freddydumont@users.noreply.github.com>
2022-08-15 16:46:25 -04:00
Adam Warner cbe61e0b44
Use dorny/paths-filter instead of the built-in path exclude. This allows us to skip "required" jobs set in branch protection rules 2022-08-01 18:37:17 +01:00
Adam Warner b7a1e924ed
Merge pull request #1161 from zimmertr/fix_readme_syntax
Add missing backticks to Experimental Variables section on README for consistent markdown
2022-08-01 10:19:28 +01:00
TJ Zimmerman 40224be544 Add missing backticks to Exp. Vars for formatting. 2022-08-01 00:10:51 -07:00
Adam Warner 4acba89c3e
Merge pull request #1158 from pi-hole/dontbuildreadme
Don't run full test and build when only the README file is changed
2022-08-01 08:08:45 +01:00
Adam Warner 0f3f8fb571
Don't run full test and build for changes to the README file (in theory!) 2022-08-01 08:00:55 +01:00