From 996fae940e2e619cda699aaf934d7e92d0ec9eab Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 20 Feb 2025 21:35:14 +0100 Subject: [PATCH] Change default value of webserver.port to comply with auto-generated config string Signed-off-by: DL6ER --- src/config/config.c | 2 +- test/pihole.toml | 2 +- test/test_suite.bats | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/config.c b/src/config/config.c index 5d9d45e10..aeb662b69 100644 --- a/src/config/config.c +++ b/src/config/config.c @@ -1004,7 +1004,7 @@ static void initConfig(struct config *conf) conf->webserver.port.a = cJSON_CreateStringReference("comma-separated list of <[ip_address:]port>"); conf->webserver.port.f = FLAG_RESTART_FTL; conf->webserver.port.t = CONF_STRING; - conf->webserver.port.d.s = (char*)"80o,[::]:80o,443so,[::]:443so"; + conf->webserver.port.d.s = (char*)"80o,443os,[::]:80o,[::]:443os"; conf->webserver.port.c = validate_stub; // Type-based checking + civetweb syntax checking conf->webserver.threads.k = "webserver.threads"; diff --git a/test/pihole.toml b/test/pihole.toml index 7118005a5..d46e14027 100644 --- a/test/pihole.toml +++ b/test/pihole.toml @@ -657,7 +657,7 @@ # # Possible values are: # comma-separated list of <[ip_address:]port> - port = "80o,[::]:80o,443so,[::]:443so" + port = "80o,443os,[::]:80o,[::]:443os" # Maximum number of worker threads allowed. # The Pi-hole web server handles each incoming connection in a separate thread. diff --git a/test/test_suite.bats b/test/test_suite.bats index 413c1d15b..fbba82d60 100644 --- a/test/test_suite.bats +++ b/test/test_suite.bats @@ -2105,7 +2105,7 @@ [[ "${lines[0]}" == "[ 1.1.1.1 abc-custom.com def-custom.de, 2.2.2.2 äste.com steä.com ]" ]] run bash -c './pihole-FTL --config webserver.port' printf "%s\n" "${lines[@]}" - [[ "${lines[0]}" == "80o,[::]:80o,443so,[::]:443so" ]] + [[ "${lines[0]}" == "80o,443os,[::]:80o,[::]:443os" ]] } @test "Create, verify and re-import Teleporter file via CLI" {