rename LIVEBOOK_PUBLIC_BASE_URL_PATH_OVERRIDE to LIVEBOOK_PUBLIC_BA…

…SE_URL_PATH

README.md

@@ -196,9 +196,10 @@ The following environment variables can be used to configure Livebook on boot:
   * `LIVEBOOK_BASE_URL_PATH` - sets the base url path the web application is
     served on. Useful when deploying behind a reverse proxy.
 
-  * `LIVEBOOK_PUBLIC_BASE_URL_PATH_OVERRIDE` - overrides the base url path for the public
-    asset routes only. Useful to create exceptions when deploying behind a reverse proxy 
-    that requires authentication.
+  * `LIVEBOOK_PUBLIC_BASE_URL_PATH` - sets the base url path the `/public/*` routes
+    are served on. Note that this takes precedence over `LIVEBOOK_BASE_URL_PATH`,
+    if both are set. Setting this may be useful to create exceptions when deploying
+    behind a reverse proxy that requires authentication.
 
   * `LIVEBOOK_CACERTFILE` - path to a local file containing CA certificates.
     Those certificates are used during for server authentication when Livebook

lib/livebook.ex

@@ -114,9 +114,9 @@ defmodule Livebook do
       config :livebook, LivebookWeb.Endpoint, url: [path: base_url_path]
     end
 
-    if public_base_url_path_override =
-         Livebook.Config.public_base_url_path_override!("LIVEBOOK_PUBLIC_BASE_URL_PATH_OVERRIDE") do
-      config :livebook, :public_base_url_path_override, public_base_url_path_override
+    if public_base_url_path =
+         Livebook.Config.base_url_path!("LIVEBOOK_PUBLIC_BASE_URL_PATH") do
+      config :livebook, :public_base_url_path, public_base_url_path
     end
 
     if password = Livebook.Config.password!("LIVEBOOK_PASSWORD") do

lib/livebook/config.ex

@@ -231,7 +231,7 @@ defmodule Livebook.Config do
   """
   @spec public_base_url_path() :: String.t()
   def public_base_url_path() do
-    case Application.get_env(:livebook, :public_base_url_path_override) do
+    case Application.get_env(:livebook, :public_base_url_path) do
       nil -> base_url_path()
       path -> String.trim_trailing(path, "/")
     end
@@ -536,15 +536,6 @@ defmodule Livebook.Config do
     end
   end
 
-  @doc """
-  Parses and validates the public base url path override from env
-  """
-  def public_base_url_path_override!(env) do
-    if override = System.get_env(env) do
-      String.trim_trailing(override, "/")
-    end
-  end
-
   @doc """
   Parses and validates the ip from env.
   """