refactor: Remove envvar hotfix needed for 0.36.1

Author: tomasol

workflow/deployer-workflow/src/lib.rs

@@ -502,22 +502,7 @@ fn start_final_vm(
                 swap_size_mb: Some(FINAL_VM_SWAP_MB),
                 tty: None,
             }),
-            env: Some(vec![
-                // Fix for Obelisk 0.36.1 - fly.io does not allow unsetting those env vars set in Dockerfile.
-                // Using [::] for when a port is not exposed and needs `fly proxy` forwarding.
-                (
-                    "OBELISK__API__LISTENING_ADDR".to_string(),
-                    Some(format!("[::]:{API_INTERNAL_PORT}")),
-                ),
-                (
-                    "OBELISK__EXTERNAL__LISTENING_ADDR".to_string(),
-                    Some(format!("[::]:{WEBHOOK_INTERNAL_PORT}")),
-                ),
-                (
-                    "OBELISK__WEBUI__LISTENING_ADDR".to_string(),
-                    Some("[::]:8080".to_string()),
-                ),
-            ]),
+            env: None,
             restart: Some(MachineRestart {
                 max_retries: Some(MAX_VM_FAILURE_RETRIES),
                 policy: RestartPolicy::OnFailure,

workflow/deployer-workflow/src/snapshots/obelisk_deployer_flyio__toml__tests__server_toml.snap

@@ -2,13 +2,18 @@
 source: workflow/deployer-workflow/src/toml.rs
 expression: server_toml
 ---
+[api]
+listening_addr = "[::]:5005"
 
 [database.sqlite]
 directory = "/volume/obelisk-sqlite"
 
 [database.sqlite.pragma]
 cache_size = "3000"
 
+[external]
+listening_addr = "[::]:9090"
+
 [[http_server]]
 listening_addr = "[::]:9091"
 name = "healthcheck_server"
@@ -25,3 +30,6 @@ parallel_compilation = false
 
 [wasm.codegen_cache]
 directory = "/volume/codegen"
+
+[webui]
+listening_addr = "[::]:8080"

workflow/deployer-workflow/src/toml.rs

@@ -1,5 +1,8 @@
 use crate::generated::obelisk_flyio::workflow::types::ObeliskConfig;
-use crate::{HEALTHCHECK_INTERNAL_PORT, SQLITE_DIRECTORY_PATH, VOLUME_MOUNT_PATH};
+use crate::{
+    API_INTERNAL_PORT, HEALTHCHECK_INTERNAL_PORT, SQLITE_DIRECTORY_PATH, VOLUME_MOUNT_PATH,
+    WEBHOOK_INTERNAL_PORT,
+};
 use anyhow::{Context, anyhow};
 use toml::Table;
 
@@ -28,10 +31,14 @@ pub(crate) fn serialize_obelisk_toml(
 
     let server_toml_template = format!(
         r#"
-wasm.cache_directory = "{VOLUME_MOUNT_PATH}/wasm"
-wasm.codegen_cache.directory = "{VOLUME_MOUNT_PATH}/codegen"
-
-wasm.parallel_compilation = false
+api.listening_addr = "[::]:{API_INTERNAL_PORT}"
+webui.listening_addr = "[::]:8080"
+external.listening_addr = "[::]:{WEBHOOK_INTERNAL_PORT}"
+
+[wasm]
+cache_directory = "{VOLUME_MOUNT_PATH}/wasm"
+codegen_cache.directory = "{VOLUME_MOUNT_PATH}/codegen"
+parallel_compilation = false
 
 [database.sqlite]
 directory = "{SQLITE_DIRECTORY_PATH}"