Skip to content

Commit

Permalink
Merge pull request #2098 from pi-hole/tweak/cert_help
Browse files Browse the repository at this point in the history
Amend the help text of the TLS certificate
  • Loading branch information
DL6ER authored Oct 27, 2024
2 parents 66c93b8 + 2c10b31 commit 3dd756d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/config/config.c
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
9 changes: 5 additions & 4 deletions test/pihole.toml
Original file line number Diff line number Diff line change
Expand Up @@ -668,10 +668,11 @@
restore = true

[webserver.tls]
# 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).
# 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).
# The *.pem file can be created using
# cp server.crt server.pem
# cat server.key >> server.pem
Expand Down

0 comments on commit 3dd756d

Please sign in to comment.