YGGverse/agate
1
0
Fork 0
mirror of https://github.com/YGGverse/agate.git synced 2026-04-08 20:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update old references to cert.pem

Browse source
This commit is contained in:
Matt Brubeck 2023-12-18 10:31:06 -08:00
parent a19007556c
commit a6c2fdf7e7
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
content/index.gmi
View file

@ -170,13 +170,13 @@ Certificates are by default stored in the `.certificates` directory. This is a h
``` ```
.certificates .certificates
|-- cert.pem (1) |-- cert.der (1)
|-- key.der (1) |-- key.der (1)
|-- example.org |-- example.org
| |-- cert.pem (2) | |-- cert.der (2)
| `-- key.der (2) | `-- key.der (2)
`-- portal.example.org `-- portal.example.org
|-- cert.pem (3) |-- cert.der (3)
`-- key.der (3) `-- key.der (3)
``` ```

6
src/certificates.rs
View file

@ -119,10 +119,10 @@ impl CertStore {
/// Load certificates from a certificate directory. /// Load certificates from a certificate directory.
/// Certificates should be stored in a folder for each hostname, for example /// Certificates should be stored in a folder for each hostname, for example
/// the certificate and key for `example.com` should be in the files /// 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 /// If there are `cert.der` and `key.der` directly in `certs_dir`, these
/// loaded as default certificates. /// will be loaded as default certificates.
pub fn load_from(certs_dir: &Path) -> Result<Self, CertLoadError> { pub fn load_from(certs_dir: &Path) -> Result<Self, CertLoadError> {
// load all certificates from directories // load all certificates from directories
let mut certs = vec![]; let mut certs = vec![];

8
tools/freebsd/startup.sh
View file

@ -13,8 +13,8 @@
# Set it to YES to enable agate. # Set it to YES to enable agate.
# agate_user: default www # agate_user: default www
# agate_content: default /usr/local/www/gemini # agate_content: default /usr/local/www/gemini
# agate_key: default /usr/local/etc/gemini/ssl/key.rsa # agate_key: default /usr/local/etc/gemini/ssl/key.der
# agate_cert: default /usr/local/etc/gemini/ssl/cert.pem # agate_cert: default /usr/local/etc/gemini/ssl/cert.der
# agate_hostname: e.g., gemini.example.tld, default hostname # agate_hostname: e.g., gemini.example.tld, default hostname
# agate_addr: default [::], listen on IPV4 and IPV6 # agate_addr: default [::], listen on IPV4 and IPV6
# agate_port: default 1965 # agate_port: default 1965
@ -32,8 +32,8 @@ load_rc_config $name
: ${agate_enable:="NO"} : ${agate_enable:="NO"}
: ${agate_user:="www"} : ${agate_user:="www"}
: ${agate_content:="/usr/local/www/gemini/"} : ${agate_content:="/usr/local/www/gemini/"}
: ${agate_key:="/usr/local/etc/gemini/ssl/key.rsa"} : ${agate_key:="/usr/local/etc/gemini/ssl/key.der"}
: ${agate_cert:="/usr/local/etc/gemini/ssl/cert.pem"} : ${agate_cert:="/usr/local/etc/gemini/ssl/cert.der"}
: ${agate_hostname:=`uname -n`} : ${agate_hostname:=`uname -n`}
: ${agate_addr:="[::]"} : ${agate_addr:="[::]"}
: ${agate_port:="1965"} : ${agate_port:="1965"}