feat: several updates

modules/tools.nix

@@ -9,12 +9,19 @@ let
     (
       if (!lib.strings.isString arg) then
         "${config.globals.ip_prefix}${toString arg}"
-      else
+      else if (lib.hasAttr arg config.id) then
         let
           id = config.id.${arg};
           ip = if (id > 1000) then id - 1000 else id;
         in
         "${config.globals.ip_prefix}${toString ip}"
+      else if (lib.hasAttr arg config.globals.other_hosts) then
+        let
+          ip = config.globals.other_hosts.${arg}.ip;
+        in
+        "${config.globals.ip_prefix}${toString ip}"
+      else
+        "${config.globals.ip_prefix}${toString arg}" # probably erroneous
     );
   build_ip_cidr = arg: "${build_ip arg}/${toString config.globals.cidr}";
   mask_cidr = build_ip_cidr 0;
@@ -29,6 +36,12 @@ let
       db_name = base;
     in
     "postgresql://${db_user}:${db_pass}@${db_host}:${db_port}/${db_name}";
+  build_proto_uri =
+    proto: container: port:
+    let
+      ip = build_ip container;
+    in
+    "${proto}://${ip}:${toString port}";
 in
 {
   build_ip = build_ip;
@@ -36,6 +49,7 @@ in
   mask_cidr = mask_cidr;
   build_hostname = build_hostname;
   build_db_uri = build_db_uri;
+  build_proto_uri = build_proto_uri;
 
   loki_addr = "${build_ip "monitoring"}:3100";
   metrics_addr = "${build_ip "metrics"}:9090";