diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-12-25 19:19:19 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-12-25 19:23:18 +0100 |
| commit | 3b9e75634aa06b6df0519e5d44fd6e5281712d09 (patch) | |
| tree | d82e14884993895a13cdca78c7388de2e0846f0f /src/config | |
| parent | 4d4d453afa3edafe71db2ae60171b8696b38a3c9 (diff) | |
| download | diplonat-3b9e75634aa06b6df0519e5d44fd6e5281712d09.tar.gz diplonat-3b9e75634aa06b6df0519e5d44fd6e5281712d09.zip | |
Allow Diplonat to automatically detect it's private IP
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/options.rs | 4 | ||||
| -rw-r--r-- | src/config/runtime.rs | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/config/options.rs b/src/config/options.rs index b8dccf7..f62d14c 100644 --- a/src/config/options.rs +++ b/src/config/options.rs @@ -62,7 +62,9 @@ impl ConfigOpts { // Currently only used in tests #[allow(dead_code)] pub fn from_iter<Iter: Clone>(iter: Iter) -> Result<RuntimeConfig> - where Iter: IntoIterator<Item = (String, String)> { + where + Iter: IntoIterator<Item = (String, String)>, + { let base: ConfigOptsBase = envy::prefixed("DIPLONAT_").from_iter(iter.clone())?; let consul: ConfigOptsConsul = envy::prefixed("DIPLONAT_CONSUL_").from_iter(iter.clone())?; let acme: ConfigOptsAcme = envy::prefixed("DIPLONAT_ACME_").from_iter(iter.clone())?; diff --git a/src/config/runtime.rs b/src/config/runtime.rs index eeb34f6..a1582e4 100644 --- a/src/config/runtime.rs +++ b/src/config/runtime.rs @@ -27,7 +27,7 @@ pub struct RuntimeConfigFirewall { #[derive(Debug)] pub struct RuntimeConfigIgd { - pub private_ip: String, + pub private_ip: Option<String>, pub expiration_time: Duration, pub refresh_time: Duration, } @@ -59,7 +59,7 @@ impl RuntimeConfig { impl RuntimeConfigAcme { pub fn new(opts: ConfigOptsAcme) -> Result<Option<Self>> { if !opts.enable { - return Ok(None) + return Ok(None); } let email = opts.email.expect( @@ -91,9 +91,7 @@ impl RuntimeConfigFirewall { impl RuntimeConfigIgd { pub(super) fn new(opts: ConfigOptsBase) -> Result<Self> { - let private_ip = opts - .private_ip - .expect("'DIPLONAT_PRIVATE_IP' environment variable is required"); + let private_ip = opts.private_ip; let expiration_time = Duration::from_secs( opts .expiration_time @@ -108,7 +106,7 @@ impl RuntimeConfigIgd { (currently: {}s)", expiration_time.as_secs(), refresh_time.as_secs() - )) + )); } Ok(Self { |