From a6c2fdf7e7b788bffd8640a3ec8afca2b096681e Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Mon, 18 Dec 2023 10:31:06 -0800 Subject: [PATCH] Update old references to cert.pem --- content/index.gmi | 6 +++--- src/certificates.rs | 6 +++--- tools/freebsd/startup.sh | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content/index.gmi b/content/index.gmi index 2415f36..ac7be67 100644 --- a/content/index.gmi +++ b/content/index.gmi @@ -170,13 +170,13 @@ Certificates are by default stored in the `.certificates` directory. This is a h ``` .certificates -|-- cert.pem (1) +|-- cert.der (1) |-- key.der (1) |-- example.org -| |-- cert.pem (2) +| |-- cert.der (2) | `-- key.der (2) `-- portal.example.org - |-- cert.pem (3) + |-- cert.der (3) `-- key.der (3) ``` diff --git a/src/certificates.rs b/src/certificates.rs index ab519ff..1bcab9d 100644 --- a/src/certificates.rs +++ b/src/certificates.rs @@ -119,10 +119,10 @@ impl CertStore { /// Load certificates from a certificate directory. /// Certificates should be stored in a folder for each hostname, for example /// the certificate and key for `example.com` should be in the files - /// `certs_dir/example.com/{cert.pem,key.rsa}` respectively. + /// `certs_dir/example.com/{cert.der,key.der}` respectively. /// - /// If there are `cert.pem` and `key.rsa` directly in certs_dir, these will be - /// loaded as default certificates. + /// If there are `cert.der` and `key.der` directly in `certs_dir`, these + /// will be loaded as default certificates. pub fn load_from(certs_dir: &Path) -> Result { // load all certificates from directories let mut certs = vec![]; diff --git a/tools/freebsd/startup.sh b/tools/freebsd/startup.sh index ce9ea8f..aeb04fa 100644 --- a/tools/freebsd/startup.sh +++ b/tools/freebsd/startup.sh @@ -13,8 +13,8 @@ # Set it to YES to enable agate. # agate_user: default www # agate_content: default /usr/local/www/gemini -# agate_key: default /usr/local/etc/gemini/ssl/key.rsa -# agate_cert: default /usr/local/etc/gemini/ssl/cert.pem +# agate_key: default /usr/local/etc/gemini/ssl/key.der +# agate_cert: default /usr/local/etc/gemini/ssl/cert.der # agate_hostname: e.g., gemini.example.tld, default hostname # agate_addr: default [::], listen on IPV4 and IPV6 # agate_port: default 1965 @@ -32,8 +32,8 @@ load_rc_config $name : ${agate_enable:="NO"} : ${agate_user:="www"} : ${agate_content:="/usr/local/www/gemini/"} -: ${agate_key:="/usr/local/etc/gemini/ssl/key.rsa"} -: ${agate_cert:="/usr/local/etc/gemini/ssl/cert.pem"} +: ${agate_key:="/usr/local/etc/gemini/ssl/key.der"} +: ${agate_cert:="/usr/local/etc/gemini/ssl/cert.der"} : ${agate_hostname:=`uname -n`} : ${agate_addr:="[::]"} : ${agate_port:="1965"}