Deuxfleurs/diplonat
23
4
Fork 1
Code Issues 8 Pull requests Releases Wiki Activity

Modular Diplonat (with the option to disable useless modules) #8

Closed
adrien wants to merge 12 commits from adrien/diplonat:feature/modular-config into main
pull from: adrien/diplonat:feature/modular-config
merge into: Deuxfleurs:main
Conversation 4 Commits 12 Files changed 11 +6 -6
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit beefcd7ade - Show all commits

0
src/config/options_test.rs → src/config/config_test.rs
View file

4
src/config/mod.rs
View file

@ -1,6 +1,6 @@
mod options;
#[cfg(test)] #[cfg(test)]
mod options_test; mod config_test;
mod options;
mod runtime; mod runtime;
pub use options::{ pub use options::{

8
src/config/runtime.rs
View file

@ -46,10 +46,10 @@ pub struct RuntimeConfig {
impl RuntimeConfig { impl RuntimeConfig {
pub fn new(opts: ConfigOpts) -> Result<Self> { pub fn new(opts: ConfigOpts) -> Result<Self> {
let consul = RuntimeConfigConsul::new(opts.consul.clone())?; let consul = RuntimeConfigConsul::new(opts.consul)?;
let acme = RuntimeConfigAcme::new(opts.acme.clone())?; let acme = RuntimeConfigAcme::new(opts.acme)?;
let firewall = RuntimeConfigFirewall::new(opts.firewall.clone())?; let firewall = RuntimeConfigFirewall::new(opts.firewall)?;
let igd = RuntimeConfigIgd::new(opts.igd.clone())?; let igd = RuntimeConfigIgd::new(opts.igd)?;
Ok(Self { Ok(Self {
acme, acme,