Keep old config system

This commit is contained in:
Nadja Reitzenstein 2022-03-20 22:27:27 +01:00
parent e6682ca8a8
commit c402c71abc

View File

@ -6,7 +6,7 @@ use serde::{Serialize, Deserialize};
use std::fmt::Formatter; use std::fmt::Formatter;
use std::net::{ToSocketAddrs}; use std::net::{ToSocketAddrs};
use serde_dhall::{SimpleType}; use serde_dhall::StaticType;
mod dhall; mod dhall;
@ -17,14 +17,6 @@ use crate::authorization::roles::Role;
use crate::capnp::{Listen, TlsListen}; use crate::capnp::{Listen, TlsListen};
use crate::logging::LogConfig; use crate::logging::LogConfig;
pub fn load(path: impl AsRef<Path>, args: &clap::ArgMatches) -> anyhow::Result<Config> {
unimplemented!()
}
pub struct ConfigBlock {
static_type: SimpleType,
}
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)] #[serde(deny_unknown_fields)]
/// A description of a machine /// A description of a machine
@ -99,12 +91,6 @@ pub struct ModuleConfig {
pub params: HashMap<String, String> pub params: HashMap<String, String>
} }
pub struct ListenSock {
listen: Listen,
tls_config: TlsListen,
}
pub(crate) fn deser_option<'de, D, T>(d: D) -> std::result::Result<Option<T>, D::Error> pub(crate) fn deser_option<'de, D, T>(d: D) -> std::result::Result<Option<T>, D::Error>
where D: serde::Deserializer<'de>, T: serde::Deserialize<'de>, where D: serde::Deserializer<'de>, T: serde::Deserialize<'de>,
{ {