From 4627a82adb39ca588fc8b0143bb1f12f84b7e107 Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Sat, 7 Dec 2019 10:16:59 -0500 Subject: [PATCH] add missing file roots --- config/config.exs | 6 ++++++ config/prod.secret.exs | 6 ++++++ mix.exs | 3 ++- mix.lock | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/config/config.exs b/config/config.exs index 298af5a7..4cde91d6 100644 --- a/config/config.exs +++ b/config/config.exs @@ -20,6 +20,12 @@ config :philomena, tag_url_root: "/media", channel_url_root: "/media", image_file_root: "priv/static/system/images", + advert_file_root: "priv/static/system/images/adverts", + avatar_file_root: "priv/static/system/images/avatars", + badge_file_root: "priv/static/system/images", + channel_image_file_root: "priv/static/system/images", + channel_banner_file_root: "priv/static/system/images", + tag_file_root: "priv/static/system/images", cdn_host: "", proxy_host: nil, quick_tags_json: File.read!("config/quick_tag_table.json"), diff --git a/config/prod.secret.exs b/config/prod.secret.exs index 4ff5a41a..1400a9aa 100644 --- a/config/prod.secret.exs +++ b/config/prod.secret.exs @@ -15,8 +15,13 @@ config :bcrypt_elixir, log_rounds: String.to_integer(System.get_env("BCRYPT_ROUNDS") || "12") config :philomena, + channel_image_file_root: System.get_env("CHANNEL_IMAGE_FILE_ROOT"), + channel_banner_file_root: System.get_env("CHANNEL_BANNER_FILE_ROOT"), anonymous_name_salt: System.get_env("ANONYMOUS_NAME_SALT"), + advert_file_root: System.get_env("ADVERT_FILE_ROOT"), + avatar_file_root: System.get_envr("AVATAR_FILE_ROOT"), channel_url_root: System.get_env("CHANNEL_URL_ROOT"), + badge_file_root: System.get_env("BADGE_FILE_ROOT"), password_pepper: System.get_env("PASSWORD_PEPPER"), avatar_url_root: System.get_env("AVATAR_URL_ROOT"), advert_url_root: System.get_env("ADVERT_URL_ROOT"), @@ -26,6 +31,7 @@ config :philomena, image_url_root: System.get_env("IMAGE_URL_ROOT"), badge_url_root: System.get_env("BADGE_URL_ROOT"), mailer_address: System.get_env("MAILER_ADDRESS"), + tag_file_root: System.get_env("TAG_FILE_ROOT"), tag_url_root: System.get_env("TAG_URL_ROOT"), proxy_host: System.get_env("PROXY_HOST"), camo_host: System.get_env("CAMO_HOST"), diff --git a/mix.exs b/mix.exs index bfece2aa..5e0e8f80 100644 --- a/mix.exs +++ b/mix.exs @@ -61,7 +61,8 @@ defmodule Philomena.MixProject do {:remote_ip, "~> 0.2.0"}, {:briefly, "~> 0.3.0"}, {:phoenix_mtm, "~> 1.0.0"}, - {:yaml_elixir, "~> 2.4.0"} + {:yaml_elixir, "~> 2.4.0"}, + {:distillery, "~> 2.1"} ] end diff --git a/mix.lock b/mix.lock index 1645e02a..eda2e2d0 100644 --- a/mix.lock +++ b/mix.lock @@ -1,4 +1,5 @@ %{ + "artificery": {:hex, :artificery, "0.4.2", "3ded6e29e13113af52811c72f414d1e88f711410cac1b619ab3a2666bbd7efd4", [:mix], [], "hexpm"}, "bamboo": {:hex, :bamboo, "1.3.0", "9ab7c054f1c3435464efcba939396c29c5e1b28f73c34e1f169e0881297a3141", [:mix], [{:hackney, ">= 1.13.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, "bamboo_smtp": {:hex, :bamboo_smtp, "1.7.0", "f0d213e18ced1f08b551a72221e9b8cfbf23d592b684e9aa1ef5250f4943ef9b", [:mix], [{:bamboo, "~> 1.2", [hex: :bamboo, repo: "hexpm", optional: false]}, {:gen_smtp, "~> 0.14.0", [hex: :gen_smtp, repo: "hexpm", optional: false]}], "hexpm"}, "bcrypt_elixir": {:hex, :bcrypt_elixir, "2.0.3", "64e0792d5b5064391927bf3b8e436994cafd18ca2d2b76dea5c76e0adcf66b7c", [:make, :mix], [{:comeonin, "~> 5.1", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"}, @@ -13,6 +14,7 @@ "cowlib": {:hex, :cowlib, "2.8.0", "fd0ff1787db84ac415b8211573e9a30a3ebe71b5cbff7f720089972b2319c8a4", [:rebar3], [], "hexpm"}, "db_connection": {:hex, :db_connection, "2.1.1", "a51e8a2ee54ef2ae6ec41a668c85787ed40cb8944928c191280fe34c15b76ae5", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"}, "decimal": {:hex, :decimal, "1.8.0", "ca462e0d885f09a1c5a342dbd7c1dcf27ea63548c65a65e67334f4b61803822e", [:mix], [], "hexpm"}, + "distillery": {:hex, :distillery, "2.1.1", "f9332afc2eec8a1a2b86f22429e068ef35f84a93ea1718265e740d90dd367814", [:mix], [{:artificery, "~> 0.2", [hex: :artificery, repo: "hexpm", optional: false]}], "hexpm"}, "ecto": {:hex, :ecto, "3.2.5", "76c864b77948a479e18e69cc1d0f0f4ee7cced1148ffe6a093ff91eba644f0b5", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, "ecto_network": {:hex, :ecto_network, "1.1.0", "7062004b9324ff13e50c02dab84877f8a55e06db9eabbf2d04bda21da6fc6e8a", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:phoenix_html, ">= 0.0.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:postgrex, ">= 0.14.0", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm"}, "ecto_sql": {:hex, :ecto_sql, "3.2.0", "751cea597e8deb616084894dd75cbabfdbe7255ff01e8c058ca13f0353a3921b", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.2.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.2.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},