Making more config options optional

pmeunier

May 16, 2026, 5:07 PM

2WZEWLK7E4EUMYP6LH4C6T6ZID5QYR25UNGMFGF6GKSRPVSP6YFAC

Dependencies

• [2] D4SBRY6K Initial patch
• [3] X7GJK2QD Update
• [4] NV5CPVRH Getting rid of AWS SES to send emails
• [5] LE34RHBB Fixing a CORS bug
• [6] YYJ76Q7V Initial attempt at CI/CD

Change contents

• edit in api/src/config_file.rs at line 29
  [2.530741]

  [4.1500]
  + #[serde(default)]
• edit in api/src/config_file.rs at line 31
  [4.1536]

  [2.530769]
  + #[serde(default)]
• edit in api/src/config_file.rs at line 34
  [2.530831]

  [2.530831]
  + #[serde(default)]
• edit in api/src/config_file.rs at line 36
  [2.530863]

  [2.530863]
  + #[serde(default)]
• edit in api/src/config_file.rs at line 38
  [2.530893]

  [2.530893]
  + #[serde(default)]
• replacement in api/src/config_file.rs at line 41
  [2.530959]→[2.530959:530991](∅→∅)
  − pub geoip_database: String,
  [2.530959]

  [2.530991]
  + #[serde(default)]

  + pub geoip_database: Option<String>,
• replacement in api/src/config.rs at line 37
  [2.533786]→[2.533786:533831](∅→∅)
  − pub maxmind: maxminddb::Reader<Vec<u8>>,
  [2.533786]

  [2.533831]
  + pub maxmind: Option<maxminddb::Reader<Vec<u8>>>,
• replacement in api/src/config.rs at line 247
  [2.540498]→[2.540498:540563](∅→∅)
  − maxminddb::Reader::open_readfile(&path).unwrap()
  [2.540498]

  [2.540563]
  + Some(maxminddb::Reader::open_readfile(&path).unwrap())

  + } else if let Some(ref db) = config_file.geoip_database {

  + Some(maxminddb::Reader::open_readfile(db).unwrap())
• replacement in api/src/config.rs at line 251
  [2.540584]→[2.540584:540671](∅→∅)
  − maxminddb::Reader::open_readfile(&config_file.geoip_database).unwrap()
  [2.540584]

  [2.540671]
  + None
• replacement in api/src/config.rs at line 322
  [3.12752]→[2.542606:542816](∅→∅),[2.542606]→[2.542606:542816](∅→∅)
  − let ip = match ip {

  − IpAddr::V6(addr) => {

  − if let Some(ip) = addr.to_ipv4() {

  − IpAddr::V4(ip)

  − } else {

  − IpAddr::V6(addr)
  [3.12752]

  [2.542816]
  + if let Some(ref maxmind) = self.maxmind {

  + let ip = match ip {

  + IpAddr::V6(addr) => {

  + if let Some(ip) = addr.to_ipv4() {

  + IpAddr::V4(ip)

  + } else {

  + IpAddr::V6(addr)

  + }
• replacement in api/src/config.rs at line 331
  [2.542834]→[2.542834:542913](∅→∅)
  − }

  − ip => ip,

  − };

  − self.maxmind.lookup(ip)
  [2.542834]

  [2.542913]
  + ip => ip,

  + };

  + maxmind.lookup(ip)

  + } else {

  + Ok(None)

  + }