Commit Graph

179 Commits

Author SHA1 Message Date
Adam Warner
f20a0d448c Add to /usr/local/bin and drop the .sh. Can now be called with padd
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 16:16:29 +00:00
Adam Warner
fbef9727c1 Update Dockerfile
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-12-11 15:47:26 +00:00
Adam Warner
201303a56a ADD padd.sh to the container root
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 15:47:26 +00:00
Adam Warner
a0421789cc CAP_STR will always be empty, since 776bac7b moved the calculation of that variable back out to bash_functions.sh
The capabilities are already set there, so they do not need to be set again here.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-11-27 22:35:31 +00:00
Adam Warner
f73c92d03b rename _gravityonboot service/script to _postFTL and move updatecheck/version output to this script
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-11-09 17:51:07 +00:00
Adam Warner
658f6de774 FTL.port file is deprecated (see https://github.com/pi-hole/FTL/pull/1445)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-24 15:11:27 +01:00
danitorregrosa
913f11beb5 S6_ARCH fix for rpi1
Resolves #1201

Signed-off-by: danitorregrosa <danitorregrosa@gmail.com>
2022-09-22 22:55:21 +02:00
Adam Warner
f94fb54a18 Some of these should not be user overridable
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-19 21:46:46 +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
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
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
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
14c67ed729 capabilites ==> capabilities
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 13:22:50 +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
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
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
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
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
6830b99e4a Start gravityonboot.sh as a background task to prevent timeouts 2022-07-21 19:46:02 +01:00
Adam Warner
b9df80b1ee Change of naming convention for oneshots 2022-07-21 19:45:30 +01:00
Adam Warner
e75e3800a2 make sure that setup_FTL_ProcessDNSSettings is the last thing called, else user set environment variables will be overridden when it sources setupVars.conf
Some additional tweaks
2022-07-19 18:22:49 +01:00
Adam Warner
1d59f257ff Reorganise the repository
Simplify the test suite now that we use buildx to build the final image
Remove tests that were never run/skipped in previous runs (same number of tests passing as were before)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-15 17:43:09 +01:00