Updates to reflect FTL's native capability of reading the FTLCONF_ env vars

[PromoFaux]

What does this PR aim to accomplish?:

Now that pi-hole/FTL#1679 (review) has been merged, we no longer need to parse the environment variables in the startup script (with the exception of FTLCONF_webserver_api_password, which we will set to a random value if none is specified) and totally negates the need for the changes made in #1456 to add special cases for FTL config names with _ in them

Password scenarios:

Env var set (With or without the addition of FTLCONF_ENV_ONLY)

ph-development-v6  |   [i] Checking web password
ph-development-v6  |   [i] Assigning password defined by Environment Variable

No env var set and pwhash empty in config file

ph-development-v6  |   [i] Checking web password
ph-development-v6  |   [i] No password set in environment or config file, assigning random password: iK1me016
ph-development-v6  |   [✓] New password set

No env var set and pwhash has a value in config file

ph-development-v6  |   [i] Checking web password
ph-development-v6  |   [i] Password already set in config file

No env var set, but FTLCONF_ENV_ONLY set to true

ph-development-v6  |   [i] Checking web password
ph-development-v6  |   [i] No password supplied via FTLCONF_webserver_api_password, but FTLCONF_ENV_ONLY is set to true, using default (none)

We also check the value of FTLCONF_dns_upstreams for ; and replace them with , to ensure compatibility with FTL's environment variable parsing. A notice will be displayed to the user in this case.

ph-development-v6  |   [i] Replacing ';' with ',' in FTLCONF_dns_upstreams - please update the environment variable to use commas instead of semicolons

Lastly some formatting/old code removal has also been applied

---

By submitting this pull request, I confirm the following:

1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
2. I have commented my proposed changes within the code and I have tested my changes.
3. I am willing to help maintain this change if there are issues with it later.
4. It is compatible with the EUPL 1.2 license
5. I have squashed any insignificant commits. (git rebase)

---

• I have read the above and my PR is ready for review. Check this box to confirm

[PromoFaux]

Forgot the tests. PR now ready

[yubiuser]

L70 of the README: add port 443

[PromoFaux]

L70 of the README: add port 443

Reading over that section again, I might even just drop most of it.

[yubiuser]

It's not the arm64 tests that misreport, but amd64.

The reported issue is

chown: cannot access '/etc/pihole/logrotate': No such file or directory\r\nchmod: cannot access '/etc/pihole/logrotate': No such file or directory

This comes from

docker-pi-hole/src/start.sh

Line 120 in 314ed3c

sh /opt/pihole/pihole-FTL-prestart.sh

Which triggers

https://github.com/pi-hole/pi-hole/blob/6cf39d9b924adf2c8bd49c7f4997b2ffff9e0a53/advanced/Templates/pihole-FTL-prestart.sh#L19-L21

Those lines were just added recently by pi-hole/pi-hole#5444.

So the test are failing rightfully, because on docker, we don't copy /etc/pihole/logrotate. You might want to touch these files on docker and add arm64 back ;-)

---

(No idea why adm64 passed, but they should not.

[yubiuser]

My previous assumption was wrong, but lead me to find out what really went wrong. It's the check for a set password using FTL itself.

docker-pi-hole/src/bash_functions.sh

Line 75 in 98049d1

if [[ -n $(pihole-FTL --config webserver.api.pwhash) ]]; then

It only checks, if there is an response at all. This is the case if FTL returns the password, but also on errors. The underlying issue here is: the test pulled the wrong architecture, because TARGETPLATFORM in the Dockerfile was not set.

I forked the repo and fixed the tests:

yubiuser@7e8712d

https://github.com/yubiuser/docker-pi-hole/actions/runs/6597244291

---

I think you should re-add the tests, they helped to identify this bug.
Additionally, you could not only check for non-emptyness, but for a string starting with

nanopi@nanopi:~$ pihole-FTL --config webserver.api.pwhash
$BALLOON-SHA256....

[PromoFaux]

Thanks for looking at that @yubiuser - reverted the commit removing the arm tests and added in the additional commit from your fork

[DL6ER]

Seems to work as expected