Made tz data location user-configurable (#238)

kieraneglin · May 13, 2024 · 77a9ff4 · 77a9ff4
1 parent d093799
commit 77a9ff4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/config/prod.exs b/config/prod.exs
@@ -7,8 +7,6 @@ import Config
 # before starting your production server.
 config :pinchflat, PinchflatWeb.Endpoint, cache_static_manifest: "priv/static/cache_manifest.json"
 
-config :tzdata, :data_dir, "/etc/elixir_tzdata_data"
-
 # Configures Swoosh API Client
 config :swoosh, api_client: Swoosh.ApiClient.Finch, finch_name: Pinchflat.Finch
 

diff --git a/config/runtime.exs b/config/runtime.exs
@@ -66,6 +66,8 @@ if config_env() == :prod do
     expose_feed_endpoints: expose_feed_endpoints,
     timezone: System.get_env("TIMEZONE") || System.get_env("TZ") || "UTC"
 
+  config :tzdata, :data_dir, System.get_env("TZ_DATA_DIR", "/etc/elixir_tzdata_data")
+
   config :pinchflat, Pinchflat.Repo,
     database: db_path,
     journal_mode: journal_mode

diff --git a/lib/pinchflat/release.ex b/lib/pinchflat/release.ex
@@ -26,14 +26,17 @@ defmodule Pinchflat.Release do
     load_app()
 
     directories =
-      Enum.uniq([
+      [
         "/config",
         "/downloads",
         Application.get_env(:pinchflat, :media_directory),
         Application.get_env(:pinchflat, :tmpfile_directory),
         Application.get_env(:pinchflat, :extras_directory),
-        Application.get_env(:pinchflat, :metadata_directory)
-      ])
+        Application.get_env(:pinchflat, :metadata_directory),
+        Application.get_env(:tzdata, :data_dir)
+      ]
+      |> Enum.uniq()
+      |> Enum.filter(&(&1 != nil))
 
     Enum.each(directories, fn dir ->
       Logger.info("Checking permissions for #{dir}")