diff options
| author | adrien <adrien@luxeylab.net> | 2021-12-28 11:56:12 +0100 |
|---|---|---|
| committer | adrien <adrien@luxeylab.net> | 2021-12-28 11:56:12 +0100 |
| commit | 4560622fa125afb8ac5161f8d0e8a353f99f7a38 (patch) | |
| tree | 0e6b8c716955ea5bb5896c5dc4c8294b69e54137 /src/config/runtime.rs | |
| parent | 4d4d453afa3edafe71db2ae60171b8696b38a3c9 (diff) | |
| parent | 7760b9c58fd98dd934a8f553dd7462049f545cf4 (diff) | |
| download | diplonat-4560622fa125afb8ac5161f8d0e8a353f99f7a38.tar.gz diplonat-4560622fa125afb8ac5161f8d0e8a353f99f7a38.zip | |
Merge pull request 'Allow Diplonat to automatically detect it's private IP' (#12) from autodetect-private-ip into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/diplonat/pulls/12
Diffstat (limited to 'src/config/runtime.rs')
| -rw-r--r-- | src/config/runtime.rs | 10 |
1 files changed, 4 insertions, 6 deletions
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 { |