tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

node config cleanups

This commit is contained in:
Dietmar Maurer 2021-05-04 09:15:57 +02:00
parent 79b902d512
commit 426847e1ce
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/config/acme/mod.rs
View File

@ -5,7 +5,7 @@ use std::path::Path;
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Error};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use proxmox::api::{api, schema::Schema}; use proxmox::api::{api, schema::{Schema, StringSchema, ApiStringFormat}};
use proxmox::sys::error::SysError; use proxmox::sys::error::SysError;
use proxmox::tools::fs::CreateOptions; use proxmox::tools::fs::CreateOptions;
@ -78,6 +78,11 @@ pub struct AcmeDomain {
pub plugin: Option<String>, pub plugin: Option<String>,
} }
pub const ACME_DOMAIN_PROPERTY_SCHEMA: Schema = StringSchema::new(
"ACME domain configuration string")
.format(&ApiStringFormat::PropertyString(&AcmeDomain::API_SCHEMA))
.schema();
#[api( #[api(
properties: { properties: {
name: { type: String }, name: { type: String },

28
src/config/node.rs
View File

@ -7,14 +7,14 @@ use nix::sys::stat::Mode;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use proxmox::api::api; use proxmox::api::api;
use proxmox::api::schema::{self, Updater}; use proxmox::api::schema::{ApiStringFormat, Updater};
use proxmox::tools::fs::{replace_file, CreateOptions}; use proxmox::tools::fs::{replace_file, CreateOptions};
use crate::acme::AcmeClient; use crate::acme::AcmeClient;
use crate::config::acme::{AccountName, AcmeDomain}; use crate::config::acme::{AccountName, AcmeDomain, ACME_DOMAIN_PROPERTY_SCHEMA};
const CONF_FILE: &str = configdir!("/node.cfg"); const CONF_FILE: &str = configdir!("/node.cfg");
const LOCK_FILE: &str = configdir!("/.node.cfg.lck"); const LOCK_FILE: &str = configdir!("/.node.lck");
const LOCK_TIMEOUT: Duration = Duration::from_secs(10); const LOCK_TIMEOUT: Duration = Duration::from_secs(10);
pub fn lock() -> Result<File, Error> { pub fn lock() -> Result<File, Error> {
@ -66,32 +66,27 @@ pub struct AcmeConfig {
acme: { acme: {
optional: true, optional: true,
type: String, type: String,
format: &schema::ApiStringFormat::PropertyString(&AcmeConfig::API_SCHEMA), format: &ApiStringFormat::PropertyString(&AcmeConfig::API_SCHEMA),
}, },
acmedomain0: { acmedomain0: {
type: String, schema: ACME_DOMAIN_PROPERTY_SCHEMA,
optional: true, optional: true,
format: &schema::ApiStringFormat::PropertyString(&AcmeDomain::API_SCHEMA),
}, },
acmedomain1: { acmedomain1: {
type: String, schema: ACME_DOMAIN_PROPERTY_SCHEMA,
optional: true, optional: true,
format: &schema::ApiStringFormat::PropertyString(&AcmeDomain::API_SCHEMA),
}, },
acmedomain2: { acmedomain2: {
type: String, schema: ACME_DOMAIN_PROPERTY_SCHEMA,
optional: true, optional: true,
format: &schema::ApiStringFormat::PropertyString(&AcmeDomain::API_SCHEMA),
}, },
acmedomain3: { acmedomain3: {
type: String, schema: ACME_DOMAIN_PROPERTY_SCHEMA,
optional: true, optional: true,
format: &schema::ApiStringFormat::PropertyString(&AcmeDomain::API_SCHEMA),
}, },
acmedomain4: { acmedomain4: {
type: String, schema: ACME_DOMAIN_PROPERTY_SCHEMA,
optional: true, optional: true,
format: &schema::ApiStringFormat::PropertyString(&AcmeDomain::API_SCHEMA),
}, },
}, },
)] )]
@ -102,23 +97,18 @@ pub struct NodeConfig {
#[serde(skip_serializing_if = "Updater::is_empty")] #[serde(skip_serializing_if = "Updater::is_empty")]
acme: Option<String>, acme: Option<String>,
/// ACME domain to get a certificate for for this node.
#[serde(skip_serializing_if = "Updater::is_empty")] #[serde(skip_serializing_if = "Updater::is_empty")]
acmedomain0: Option<String>, acmedomain0: Option<String>,
/// ACME domain to get a certificate for for this node.
#[serde(skip_serializing_if = "Updater::is_empty")] #[serde(skip_serializing_if = "Updater::is_empty")]
acmedomain1: Option<String>, acmedomain1: Option<String>,
/// ACME domain to get a certificate for for this node.
#[serde(skip_serializing_if = "Updater::is_empty")] #[serde(skip_serializing_if = "Updater::is_empty")]
acmedomain2: Option<String>, acmedomain2: Option<String>,
/// ACME domain to get a certificate for for this node.
#[serde(skip_serializing_if = "Updater::is_empty")] #[serde(skip_serializing_if = "Updater::is_empty")]
acmedomain3: Option<String>, acmedomain3: Option<String>,
/// ACME domain to get a certificate for for this node.
#[serde(skip_serializing_if = "Updater::is_empty")] #[serde(skip_serializing_if = "Updater::is_empty")]
acmedomain4: Option<String>, acmedomain4: Option<String>,
} }