Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Amend the help text of the TLS certificate #2098

Merged
merged 4 commits into from
Oct 27, 2024
Merged

Amend the help text of the TLS certificate #2098

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a7a95a
Amend the help text of the tls certificate
yubiuser Oct 26, 2024
d5b8b76
Clarify user could be different than 'piholeÄ
yubiuser Oct 26, 2024
b3b21aa
Adjust test/pihole.toml
yubiuser Oct 26, 2024
2c10b31
Our tests are a stickler
yubiuser Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/config/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ static void initConfig(struct config *conf)
conf->webserver.port.c = validate_stub; // Type-based checking + civetweb syntax checking

conf->webserver.tls.cert.k = "webserver.tls.cert";
conf->webserver.tls.cert.h = "Path to the TLS (SSL) certificate file. This option is only required when at least one of webserver.port is TLS. The file must be in PEM format, and it must have both, private key and certificate (the *.pem file created must contain a 'CERTIFICATE' section as well as a 'RSA PRIVATE KEY' section).\n The *.pem file can be created using\n cp server.crt server.pem\n cat server.key >> server.pem\n if you have these files instead";
conf->webserver.tls.cert.h = "Path to the TLS (SSL) certificate file. All directories along the path must be readable and accessible by the user running FTL (typically 'pihole'). This option is only required when at least one of webserver.port is TLS. The file must be in PEM format, and it must have both, private key and certificate (the *.pem file created must contain a 'CERTIFICATE' section as well as a 'RSA PRIVATE KEY' section).\n The *.pem file can be created using\n cp server.crt server.pem\n cat server.key >> server.pem\n if you have these files instead";
conf->webserver.tls.cert.a = cJSON_CreateStringReference("<valid TLS certificate file (*.pem)>");
conf->webserver.tls.cert.f = FLAG_RESTART_FTL;
conf->webserver.tls.cert.t = CONF_STRING;
Expand Down
3 changes: 2 additions & 1 deletion test/pihole.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,8 @@
restore = true

[webserver.tls]
# Path to the TLS (SSL) certificate file. This option is only required when at least
# Path to the TLS (SSL) certificate file. All directories along the path must be readable and accessible
# by the user running FTL (typically 'pihole'). This option is only required when at least
# one of webserver.port is TLS. The file must be in PEM format, and it must have both,
# private key and certificate (the *.pem file created must contain a 'CERTIFICATE'
# section as well as a 'RSA PRIVATE KEY' section).
yubiuser marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading