add: stuff

Kitt3120 · Kitt3120 · commit 0db9675e77de · 2025-09-21T20:43:05.000+02:00
diff --git a/docs/example-config.yaml b/docs/example-config.yaml
@@ -1,55 +1,54 @@
-# Example DNRS configuration
-
 resolver:
   ipv4:
     url: https://ip.cancom.io
     type: Raw
   ipv6:
     url: https://ipv6.cancom.io
     type: Raw
-
 providers:
-  - Nitrado:
-      name: MyNitradoProvider
-      api_key: your-nitrado-api-key-here
-      api_base_url: https://api.nitrado.net
-
+- Nitrado:
+    name: Nitrado1
+    api_key: your_api_key
+    api_base_url: https://api.nitrado.net
 dns:
-  - Nitrado:
-      provider_name: MyNitradoProvider
-      domains:
-        - domain: example.com
-          records:
-            # Use !Manual to define static records
-            - !Manual
-              domain: www
-              value: !A 127.0.0.1
-              ttl: 3600
-            - !Manual
-              domain: mail
-              value: !MX
-                priority: 10
-                target: mail.example.com
-              ttl: 3600
-            - !Manual
-              domain: ipv6-test
-              value: !AAAA ::1
-              ttl: 3600
-            - !Manual
-              domain: alias
-              value: !CNAME example.com
-              ttl: 300
-            - !Manual
-              domain: txt-record
-              value: !TXT "v=spf1 include:_spf.google.com ~all"
-              ttl: 300
-
-            # Use !Automatic to resolve IPs dynamically
-            - !Automatic
-              domain: dynamic-ipv4
-              ttl: 300
-              resolve_type: IPv4
-            - !Automatic
-              domain: dynamic-ipv6
-              ttl: 300
-              resolve_type: IPv6
+- Nitrado:
+    provider_name: Nitrado1
+    domains:
+    - domain: example.com
+      records:
+      - !Manual
+        domain: ipv4
+        value: !A 127.0.0.1
+        ttl: 3600
+      - !Manual
+        domain: ipv6
+        value: !AAAA ::1
+        ttl: 3600
+      - !Manual
+        domain: forward
+        value: !CNAME example.com
+        ttl: 3600
+      - !Manual
+        domain: '@'
+        value: !MX
+          priority: 10
+          target: mail.example.com
+        ttl: 3600
+      - !Manual
+        domain: '@'
+        value: !TXT v=spf1 include:example.com ~all
+        ttl: 3600
+      - !Manual
+        domain: '@'
+        value: !Custom
+        - RecordType
+        - Value
+        ttl: 3600
+      - !Automatic
+        domain: auto-ipv4
+        ttl: 300
+        resolve_type: IPv4
+      - !Automatic
+        domain: auto-ipv6
+        ttl: 300
+        resolve_type: IPv6
diff --git a/src/config.rs b/src/config.rs
@@ -5,48 +5,27 @@ pub mod dns;
 pub mod provider;
 pub mod resolver;
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(crate = "lum_libs::serde")]
-#[serde(default)]
-pub struct FileConfig {
-    resolver: resolver::FileConfig,
-    providers: Vec<provider::FileConfig>,
-    dns: Vec<dns::FileConfig>,
-}
-
-impl Default for FileConfig {
-    fn default() -> Self {
-        FileConfig {
-            resolver: resolver::FileConfig::default(),
-            providers: vec![provider::FileConfig::default()],
-            dns: vec![dns::FileConfig::default()],
-        }
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(crate = "lum_libs::serde")]
 #[serde(default)]
 pub struct Config {
-    pub resolver: resolver::FileConfig,
-    pub providers: Vec<provider::FileConfig>,
-    pub dns: Vec<dns::FileConfig>,
+    pub resolver: resolver::Config,
+    pub providers: Vec<provider::Config>,
+    pub dns: Vec<dns::Config>,
 }
 
 impl Default for Config {
     fn default() -> Self {
-        let file_config = FileConfig::default();
-
         Config {
-            resolver: file_config.resolver,
-            providers: file_config.providers,
-            dns: file_config.dns,
+            resolver: resolver::Config::default(),
+            providers: vec![provider::Config::default()],
+            dns: vec![dns::Config::default()],
         }
     }
 }
 
-impl MergeFrom<FileConfig> for Config {
-    fn merge_from(self, other: FileConfig) -> Self {
+impl MergeFrom<Self> for Config {
+    fn merge_from(self, other: Self) -> Self {
         Self {
             resolver: other.resolver,
             providers: other.providers,
diff --git a/src/config/dns.rs b/src/config/dns.rs
@@ -32,14 +32,14 @@ pub enum ResolveType {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(crate = "lum_libs::serde")]
-pub struct FileConfig {
+pub struct Config {
     #[serde(flatten)]
     pub dns: Type,
 }
 
-impl Default for FileConfig {
+impl Default for Config {
     fn default() -> Self {
-        FileConfig {
+        Config {
             dns: Type::Nitrado(nitrado::DnsConfig::default()),
         }
     }
diff --git a/src/config/provider.rs b/src/config/provider.rs
@@ -10,14 +10,14 @@ pub enum Provider {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(crate = "lum_libs::serde")]
-pub struct FileConfig {
+pub struct Config {
     #[serde(flatten)]
     pub provider: Provider,
 }
 
-impl Default for FileConfig {
+impl Default for Config {
     fn default() -> Self {
-        FileConfig {
+        Config {
             provider: Provider::Nitrado(nitrado::ProviderConfig::default()),
         }
     }
diff --git a/src/config/resolver.rs b/src/config/resolver.rs
@@ -18,14 +18,14 @@ pub struct IpResolver {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(crate = "lum_libs::serde")]
-pub struct FileConfig {
+pub struct Config {
     pub ipv4: IpResolver,
     pub ipv6: IpResolver,
 }
 
-impl Default for FileConfig {
+impl Default for Config {
     fn default() -> Self {
-        FileConfig {
+        Config {
             ipv4: IpResolver {
                 url: "https://ip.cancom.io".to_string(),
                 type_: IpResolverType::Raw,
diff --git a/src/lib.rs b/src/lib.rs
@@ -12,7 +12,7 @@ pub mod provider;
 pub mod resolver;
 pub mod types;
 
-pub use config::{Config, FileConfig};
+pub use config::Config;
 pub use logger::setup_logger;
 
 pub const PROGRAM_NAME: &str = env!("CARGO_PKG_NAME");
diff --git a/src/main.rs b/src/main.rs
@@ -1,9 +1,10 @@
 use std::fmt::{self, Debug};
-use std::fs::File;
+use std::fs::{self, File};
 
-use dnrs::{Config, FileConfig, RuntimeError, run, setup_logger};
+use dnrs::{Config, RuntimeError, run, setup_logger};
 use lum_config::{ConfigPathError, EnvironmentConfigParseError, FileConfigParseError, merge};
-use lum_log::{debug, error, log::SetLoggerError};
+use lum_log::info;
+use lum_log::{error, log::SetLoggerError};
 use thiserror::Error;
 
 /*
@@ -57,9 +58,7 @@ enum Error {
     #[error("IO error: {0}")]
     Io(#[from] std::io::Error),
 
-    #[error(
-        "Unable to determine config directory. No config directory, home directory, or temp directory available."
-    )]
+    #[error("Unable to determine config directory")]
     NoConfigDirectory,
 
     #[error("Runtime error: {0}")]
@@ -78,31 +77,32 @@ async fn main() -> Result<(), Error> {
     setup_logger()?;
 
     let config_path = dirs::config_dir()
-        .or_else(|| dirs::home_dir())
-        .or_else(|| Some(std::env::temp_dir()))
         .ok_or(Error::NoConfigDirectory)?
         .join(APP_NAME)
         .join("config.yaml");
 
-    let file_config: FileConfig = if config_path.exists() {
+    let mut loaded_config: Option<Config> = None;
+    if config_path.exists() {
         let file = File::open(&config_path)?;
-        serde_yaml::from_reader(file)?
-    } else {
-        let default_config = FileConfig::default();
-
-        if let Some(parent) = config_path.parent() {
-            std::fs::create_dir_all(parent)?;
-        }
-
-        let file = File::create(&config_path)?;
-        serde_yaml::to_writer(file, &default_config)?;
+        loaded_config = Some(serde_yaml::from_reader(file)?);
+    }
+    let config_existed = loaded_config.is_some();
 
-        debug!("Created default config file at: {}", config_path.display());
-        default_config
+    let config = Config::default();
+    let config = match loaded_config {
+        Some(loaded_config) => merge(config, loaded_config),
+        None => config,
     };
 
-    let config = Config::default();
-    let config = merge(config, file_config);
+    if let Some(parent) = config_path.parent() {
+        fs::create_dir_all(parent)?;
+    }
+    let file = File::create(&config_path)?;
+    serde_yaml::to_writer(file, &config)?;
+
+    if !config_existed {
+        info!("Created default config file at: {}", config_path.display());
+    }
 
     run(config).await?;
     Ok(())
diff --git a/src/provider/nitrado.rs b/src/provider/nitrado.rs
@@ -15,7 +15,7 @@ use thiserror::Error;
 use crate::{
     config::dns::{AutomaticRecordConfig, RecordConfig, ResolveType},
     provider::{self, Feature, Provider},
-    types::dns::{self, Record, RecordValue},
+    types::dns::{self, MxRecord, Record, RecordValue},
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -72,6 +72,24 @@ impl Default for DnsConfig {
                         value: RecordValue::CNAME("example.com".to_string()),
                         ttl: Some(3600),
                     }),
+                    RecordConfig::Manual(dns::Record {
+                        domain: "@".to_string(),
+                        value: RecordValue::MX(MxRecord {
+                            priority: 10,
+                            target: "mail.example.com".to_string(),
+                        }),
+                        ttl: Some(3600),
+                    }),
+                    RecordConfig::Manual(dns::Record {
+                        domain: "@".to_string(),
+                        value: RecordValue::TXT("v=spf1 include:example.com ~all".to_string()),
+                        ttl: Some(3600),
+                    }),
+                    RecordConfig::Manual(dns::Record {
+                        domain: "@".to_string(),
+                        value: RecordValue::Custom("RecordType".to_string(), "Value".to_string()),
+                        ttl: Some(3600),
+                    }),
                     RecordConfig::Automatic(AutomaticRecordConfig {
                         domain: "auto-ipv4".to_string(),
                         ttl: Some(300),

Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@ pub enum ResolveType {`
`32`	`32`
`33`	`33`	`#[derive(Debug, Clone, Serialize, Deserialize)]`
`34`	`34`	`#[serde(crate = "lum_libs::serde")]`
`35`		`-pub struct FileConfig {`
	`35`	`+pub struct Config {`
`36`	`36`	`#[serde(flatten)]`
`37`	`37`	`pub dns: Type,`
`38`	`38`	`}`
`39`	`39`
`40`		`-impl Default for FileConfig {`
	`40`	`+impl Default for Config {`
`41`	`41`	`fn default() -> Self {`
`42`		`- FileConfig {`
	`42`	`+ Config {`
`43`	`43`	`dns: Type::Nitrado(nitrado::DnsConfig::default()),`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,14 @@ pub enum Provider {`
`10`	`10`
`11`	`11`	`#[derive(Debug, Clone, Serialize, Deserialize)]`
`12`	`12`	`#[serde(crate = "lum_libs::serde")]`
`13`		`-pub struct FileConfig {`
	`13`	`+pub struct Config {`
`14`	`14`	`#[serde(flatten)]`
`15`	`15`	`pub provider: Provider,`
`16`	`16`	`}`
`17`	`17`
`18`		`-impl Default for FileConfig {`
	`18`	`+impl Default for Config {`
`19`	`19`	`fn default() -> Self {`
`20`		`- FileConfig {`
	`20`	`+ Config {`
`21`	`21`	`provider: Provider::Nitrado(nitrado::ProviderConfig::default()),`
`22`	`22`	`}`
`23`	`23`	`}`