hatter/acme-client-rs
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: rm acme config

Browse Source
This commit is contained in:
Hatter Jiang
2021-05-05 00:36:01 +08:00
parent e80dded0ed
commit 0879c5f82d
2 changed files with 7 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/config.rs
View File

@@ -1,5 +1,4 @@
use serde::{Deserialize, Serialize};
use rust_util::util_file;
use rust_util::XResult;
use std::fs;
use acme_lib::DirectoryUrl;
@@ -27,10 +26,6 @@ impl Default for AcmeAlgo {
}
impl AcmeAlgo {
// pub fn parse_or_default(s: &str) -> AcmeAlgo {
// Self::parse(s).unwrap_or_else(|_| Default::default())
// }
pub fn parse(s: &str) -> XResult<AcmeAlgo> {
match s {
"ec256" => Ok(AcmeAlgo::Ec256),
@@ -57,10 +52,6 @@ impl Default for AcmeMode {
}
impl AcmeMode {
// pub fn parse_or_default(s: &str) -> AcmeMode {
// Self::parse(s).unwrap_or_else(|_| Default::default())
// }
pub fn parse(s: &str) -> XResult<AcmeMode> {
match s {
"prod" => Ok(AcmeMode::Prod),
@@ -77,30 +68,6 @@ impl AcmeMode {
}
}
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct AcmeConfig {
pub email: String,
pub dir: String,
pub auth_timeout: Option<u64>,
pub csr_timeout: Option<u64>,
pub concurrent: Option<u32>,
}
impl AcmeConfig {
// pub fn get_auth_timeout(&self) -> u64 {
// self.auth_timeout.unwrap_or(5_000)
// }
//
// pub fn get_csr_timeout(&self) -> u64 {
// self.csr_timeout.unwrap_or(5_000)
// }
//
// pub fn get_concurrent(&self) -> u32 {
// self.concurrent.unwrap_or(0)
// }
}
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct CertConfigItem {
@@ -191,23 +158,3 @@ impl CertConfigItem {
}
}
}
pub fn load_acme_config(file: Option<&str>, load_default: bool) -> XResult<Option<AcmeConfig>> {
if let Some(file) = file {
let s = opt_result!(util_file::read_file_content(file), "Read file: {}, failed: {}", file);
return Ok(Some(opt_result!(deser_hjson::from_str(&s), "Parse acme config file: {}, failed: {}", file)));
}
if load_default {
let default_config = util_file::read_config(None, &[
"~/acme_config.json".to_string(),
"/etc/acme_config.json".to_string(),
]);
if let Some(default_config) = default_config {
let s = opt_result!(fs::read_to_string(default_config.clone()), "Read file: {:?}, failed: {}", default_config);
return Ok(Some(opt_result!(deser_hjson::from_str(&s), "Parse acme config file: {:?}, failed: {}", default_config)));
}
}
Ok(None)
}