cargo update

Cargo.toml

@@ -13,6 +13,7 @@ codegen-units = 1
 [dependencies]
 async-compression = { version = "0.4.27", features = ["tokio", "zstd"] }
 base32 = "0.5.1"
+base64 = "0.22.1"
 bytes = "1.10.1"
 chrono = { version = "0.4.41", default-features = false, features = ["clock", "now"] }
 clap = { version = "4.5.40", features = ["derive", "env"] }
@@ -30,7 +31,7 @@ lz4 = "1.28.1"
 nix = { version = "0.30.1", features = ["user"] }
 openssl = "0.10.73"
 page_size = "0.6.0"
-reqwest = { version = "0.12.20", features = ["json", "stream", "native-tls"] }
+reqwest = { version = "0.13.1", features = ["json", "stream", "native-tls"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 serde_yaml = "0.9.34"

src/apply.rs

@@ -3,6 +3,8 @@ use log::info;
 use std::path::Path;
 use tokio::fs;
 
+use crate::base64_decode;
+
 pub async fn files(files: &[crate::File], root: &str) -> Result<()> {
     for file in files {
         let path = chroot(root, &file.path);
@@ -15,6 +17,10 @@ pub async fn files(files: &[crate::File], root: &str) -> Result<()> {
         use crate::FileKind as K;
         match &file.kind {
             K::Content(content) => fs::write(path, content.as_bytes()).await?,
+            K::Content64(content) => {
+                let content = base64_decode(content)?;
+                fs::write(path, content).await?
+            }
             K::Dir(true) => fs::create_dir(path).await?,
             K::Dir(false) => {} // shouldn't happen, but semantic is to ignore
             K::Symlink(tgt) => fs::symlink(tgt, path).await?,

src/bootstrap.rs

@@ -78,6 +78,17 @@ pub struct NetworkInterface {
     pub udev: Option<UdevFilter>,
 }
 
+impl Default for NetworkInterface {
+    fn default() -> Self {
+        Self {
+            var: "iface".into(),
+            n: 1,
+            regexps: Vec::new(),
+            udev: Some(UdevFilter::Eq("INTERFACE".into(), "eth0".into())),
+        }
+    }
+}
+
 #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
 pub struct SSHServer {
     pub listen: String,
@@ -94,7 +105,7 @@ impl Default for SSHServer {
 
 #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
 pub struct LvmVG {
-    #[serde(alias = "vg")]
+    #[serde(rename = "vg", alias = "name")]
     pub name: String,
     pub pvs: LvmPV,
 

src/dls.rs

@@ -170,6 +170,8 @@ pub struct Config {
     pub host_templates: Vec<HostConfig>,
     #[serde(default, rename = "SSLConfig")]
     pub ssl_config: String,
+    #[serde(default, deserialize_with = "deserialize_null_as_default")]
+    pub extra_ca_certs: Map<String, String>,
 }
 
 // compensate for go's encoder pitfalls

src/lib.rs

@@ -1,10 +1,10 @@
 pub mod apply;
-pub mod proxy;
 pub mod bootstrap;
 pub mod dls;
 pub mod dynlay;
 pub mod fs;
 pub mod logger;
+pub mod proxy;
 
 #[derive(Debug, Default, serde::Deserialize, serde::Serialize)]
 pub struct Config {
@@ -63,9 +63,10 @@ pub struct File {
 }
 
 #[derive(Debug, PartialEq, Eq, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "snake_case")]
+#[serde(rename_all = "lowercase")]
 pub enum FileKind {
     Content(String),
+    Content64(String),
     Symlink(String),
     Dir(bool),
 }
@@ -80,3 +81,8 @@ impl Config {
         self.files.iter().find(|f| f.path == path)
     }
 }
+
+pub fn base64_decode(s: &str) -> Result<Vec<u8>, base64::DecodeError> {
+    use base64::{prelude::BASE64_STANDARD_NO_PAD as B64, Engine};
+    B64.decode(s.trim_end_matches('='))
+}