about summary refs log tree commit diff
path: root/nixos/tests/frp.nix
diff options
context:
space:
mode:
authorAdithya Nair <adtya@adtya.xyz>2023-12-15 15:43:45 +0530
committerAdithya Nair <adtya@adtya.xyz>2024-01-18 21:37:40 +0530
commit8b5644684e27ebaf1add58753544d2ab4e34b9ab (patch)
treede994f697f4823bb5199aa835b26cd0b033af6b9 /nixos/tests/frp.nix
parentaaae35a64e9f96cf0dd87392e39f5bf881add08c (diff)
nixos/frp: use toml configFile
According to upstream, the INI configuration file is deprecated and
TOML/YAML/JSON is recommended.
Link: https://github.com/fatedier/frp/tree/dev#configuration-files
Diffstat (limited to 'nixos/tests/frp.nix')
-rw-r--r--nixos/tests/frp.nix25
1 files changed, 12 insertions, 13 deletions
diff --git a/nixos/tests/frp.nix b/nixos/tests/frp.nix
index 2f5c0f8ec933b..1f57c031a53a5 100644
--- a/nixos/tests/frp.nix
+++ b/nixos/tests/frp.nix
@@ -18,10 +18,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
         enable = true;
         role = "server";
         settings = {
-          common = {
-            bind_port = 7000;
-            vhost_http_port = 80;
-          };
+          bindPort = 7000;
+          vhostHTTPPort = 80;
         };
       };
     };
@@ -59,15 +57,16 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
         enable = true;
         role = "client";
         settings = {
-          common = {
-            server_addr = "10.0.0.1";
-            server_port = 7000;
-          };
-          web = {
-            type = "http";
-            local_port = 80;
-            custom_domains = "10.0.0.1";
-          };
+          serverAddr = "10.0.0.1";
+          serverPort = 7000;
+          proxies = [
+            {
+              name = "web";
+              type = "http";
+              localPort = 80;
+              customDomains = [ "10.0.0.1" ];
+            }
+          ];
         };
       };
     };