From a4c619b7af15b247a57e17b275d0eb84d2015d67 Mon Sep 17 00:00:00 2001 From: jake Date: Mon, 15 Aug 2022 04:14:34 -0400 Subject: Remove 'root_relative'. Touch up cert_key_dir logic. Touch up code that used 'root_relative'. Add cert_key_dir_write_warning option. Determine if a path is absolute or relative by the first character. --- config.toml.sample | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'config.toml.sample') diff --git a/config.toml.sample b/config.toml.sample index 5cd6c63..3552ae3 100644 --- a/config.toml.sample +++ b/config.toml.sample @@ -17,6 +17,10 @@ log_to_stdout = true # Unless path is absolute, it is relative to working_dir. # If this is not specified then it will place it in certs dir (and create the directory if needed, maybe not with the best permissions) cert_key_dir = "certs" # avoid putting final '/' +# If the cert_key_dir directory is not writable, then a warning will emit +# because generating cert/key pairs will fail and cause the program to die. +# Setting the following to 'false' will not emit an error. +cert_key_dir_write_warning = true ## These are not specific to default and can be used with vhost ## Vhost options will override default options @@ -24,7 +28,7 @@ cert_key_dir = "certs" # avoid putting final '/' root = "default_root" # append 'index.gmi' when the path ends with '/' or is nothing assume_index = true -# list the contents of a directory if no index.gmi is found and request is a directory? +# list the contents of a directory if no index.gmi is found and request is a directory dir_listing = false # otherwise the fallback is 'application/octet-stream' (gemini is primary text based so 'octet-stream' probably not wanted) default_mime = 'text/plain' @@ -37,11 +41,11 @@ default_mime = 'text/plain' # No need for a single config file #include_configs = ["./sites_enabled"] +# A Vhost is *required* since it both serves as vhost and server name identification (sni) # Vhost example - probably you want to see that it actually works right away ['localhost'] # Generate certificate and key automatically? Uses cert_key_dir auto_cert = true - # Overrides default setting assume_index = true @@ -49,15 +53,14 @@ assume_index = true #['example.com'] #auto_cert = false # Location to the cert/key pair is relative to cert_key_dir unless the path is absolute -# The existance of cert or key option will cause auto_cert to be ignored. +# The existance of cert and key option will cause auto_cert to be ignored. #cert = "cert.pem" # a file #key = "key.pem" # a file - +# # this Vhost's document root #root = "/srv/gemini/example.com" +# # Overrides default setting -#root_relative = false - #assume_index = true #dir_listing = true #default_mime = 'text/plain' -- cgit v1.2.3