Add listener wrappers and logs config

Signed-off-by: Zack Siri <[email protected]>
upmaru · Nov 10, 2023 · 3d13310 · 3d13310
1 parent 17152f3
commit 3d13310
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/lib/uplink/clients/caddy/apps/server.ex b/lib/uplink/clients/caddy/apps/server.ex
@@ -7,6 +7,8 @@ defmodule Uplink.Clients.Caddy.Apps.Server do
   @primary_key false
   embedded_schema do
     field :listen, {:array, :string}
+    field :listener_wrappers, {:array, :map}
+    field :logs, :map
 
     embeds_many :routes, Route, primary_key: false do
       @derive Jason.Encoder
@@ -27,7 +29,7 @@ defmodule Uplink.Clients.Caddy.Apps.Server do
 
   def changeset(server, params) do
     server
-    |> cast(params, [:listen])
+    |> cast(params, [:listen, :listener_wrappers, :logs])
     |> cast_embed(:routes, with: &route_changeset/2)
   end
 

diff --git a/lib/uplink/clients/caddy/config/builder.ex b/lib/uplink/clients/caddy/config/builder.ex
@@ -34,13 +34,14 @@ defmodule Uplink.Clients.Caddy.Config.Builder do
           }
         },
         logs: %{
-          default: %{
+          uplink: %{
             writer: %{
               output: "stdout"
             },
             encoder: %{
               format: "console"
-            }
+            },
+            include: ["http.log.access"]
           }
         }
       }
@@ -79,9 +80,16 @@ defmodule Uplink.Clients.Caddy.Config.Builder do
     %{
       "uplink" => %{
         listen: [":443"],
+        listener_wrappers: [
+          %{wrapper: "proxy_protocol"},
+          %{wrapper: "tls"}
+        ],
         routes:
           Enum.map(installs, &build_route/1)
-          |> List.flatten()
+          |> List.flatten(),
+        logs: %{
+          default_logger_name: "uplink"
+        }
       }
     }
   end
@@ -118,7 +126,7 @@ defmodule Uplink.Clients.Caddy.Config.Builder do
           handler: "reverse_proxy",
           load_balancing: %{
             selection_policy: %{
-              policy: "ip_hash"
+              policy: "least_conn"
             }
           },
           health_checks: %{
@@ -176,7 +184,7 @@ defmodule Uplink.Clients.Caddy.Config.Builder do
               handler: "reverse_proxy",
               load_balancing: %{
                 selection_policy: %{
-                  policy: "ip_hash"
+                  policy: "least_conn"
                 }
               },
               health_checks: %{

diff --git a/test/fixtures/caddy/config/get.json b/test/fixtures/caddy/config/get.json
@@ -6,6 +6,10 @@
           "listen": [
             ":2015"
           ],
+          "listener_wrappers": [
+            {"wrapper": "proxy_protocol"},
+            {"wrapper": "tls"}
+          ],
           "routes": [
             {
               "handle": [
@@ -16,7 +20,10 @@
                 }
               ]
             }
-          ]
+          ],
+          "logs": {
+            "default_logger_name": "default"
+          }
         }
       }
     }

diff --git a/test/uplink/clients/caddy_test.exs b/test/uplink/clients/caddy_test.exs
@@ -28,6 +28,17 @@ defmodule Uplink.Clients.CaddyTest do
 
       assert {:ok, config} = Caddy.get_config()
 
+      assert %{apps: %{http: %{servers: servers}}} = config
+
+      assert %{"example" => server} = servers
+
+      assert %{
+               listen: _listen,
+               listener_wrappers: _wrappers,
+               logs: %{"default_logger_name" => _},
+               routes: _routes
+             } = server
+
       assert %{apps: %Caddy.Apps{}} = config
     end
   end