@@ -3,11 +3,6 @@ use std::{fs::read_to_string, net::IpAddr, path::PathBuf, time::Duration};
33use clap:: Parser ;
44use log:: LevelFilter ;
55use serde:: Deserialize ;
6- use url:: Url ;
7-
8- fn default_url ( ) -> Url {
9- Url :: parse ( "http://localhost:8080" ) . unwrap ( )
10- }
116
127fn default_adoption_timeout ( ) -> u64 {
138 10
@@ -29,22 +24,6 @@ pub struct EnvConfig {
2924 #[ arg( long, env = "DEFGUARD_PROXY_GRPC_PORT" , default_value_t = 50051 ) ]
3025 pub grpc_port : u16 ,
3126
32- #[ arg( long, env = "DEFGUARD_PROXY_GRPC_CERT" ) ]
33- #[ serde( skip_serializing) ]
34- #[ deprecated(
35- since = "2.0.0" ,
36- note = "Certificates are automatically generated by Core CA"
37- ) ]
38- pub grpc_cert : Option < String > ,
39-
40- #[ arg( long, env = "DEFGUARD_PROXY_GRPC_KEY" ) ]
41- #[ serde( skip_serializing) ]
42- #[ deprecated(
43- since = "2.0.0" ,
44- note = "Certificates are automatically generated by Core CA"
45- ) ]
46- pub grpc_key : Option < String > ,
47-
4827 #[ arg( long, env = "DEFGUARD_PROXY_LOG_LEVEL" , default_value_t = LevelFilter :: Info ) ]
4928 pub log_level : LevelFilter ,
5029
@@ -54,17 +33,6 @@ pub struct EnvConfig {
5433 #[ arg( long, env = "DEFGUARD_PROXY_RATELIMIT_BURST" , default_value_t = 0 ) ]
5534 pub rate_limit_burst : u32 ,
5635
57- #[ arg(
58- long,
59- env = "DEFGUARD_PROXY_URL" ,
60- value_parser = Url :: parse,
61- default_value = "http://localhost:8080"
62- ) ]
63- #[ serde( default = "default_url" ) ]
64- #[ serde( skip_serializing) ]
65- #[ deprecated( since = "2.0.0" , note = "Public URL is generated by Core instead" ) ]
66- pub url : Url ,
67-
6836 /// Configuration file path
6937 #[ arg( long = "config" , short) ]
7038 #[ serde( skip) ]
0 commit comments