summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-03-30 15:01:53 +0200
committerlain <lain@soykaf.club>2018-03-30 15:01:53 +0200
commit4afbef39f49948ddd3b1cd1bbda58ff7e3ac2785 (patch)
tree6959e12d9058c981f3b69c77b8b0290049651cd6 /config
parent480932c8e524e1a80c9c8ef1a1aa23379f633afe (diff)
downloadpleroma-4afbef39f49948ddd3b1cd1bbda58ff7e3ac2785.tar.gz
pleroma-4afbef39f49948ddd3b1cd1bbda58ff7e3ac2785.zip
Format the code.
Diffstat (limited to 'config')
-rw-r--r--config/config.exs37
-rw-r--r--config/dev.exs10
-rw-r--r--config/test.exs4
3 files changed, 25 insertions, 26 deletions
diff --git a/config/config.exs b/config/config.exs
index b41551895..fc8067b49 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -6,14 +6,11 @@
use Mix.Config
# General application configuration
-config :pleroma,
- ecto_repos: [Pleroma.Repo]
+config :pleroma, ecto_repos: [Pleroma.Repo]
-config :pleroma, Pleroma.Repo,
- types: Pleroma.PostgresTypes
+config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
-config :pleroma, Pleroma.Upload,
- uploads: "uploads"
+config :pleroma, Pleroma.Upload, uploads: "uploads"
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
@@ -21,8 +18,7 @@ config :pleroma, Pleroma.Web.Endpoint,
protocol: "https",
secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
- pubsub: [name: Pleroma.PubSub,
- adapter: Phoenix.PubSub.PG2]
+ pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]
# Configures Elixir's Logger
config :logger, :console,
@@ -38,15 +34,15 @@ config :pleroma, :websub, Pleroma.Web.Websub
config :pleroma, :ostatus, Pleroma.Web.OStatus
config :pleroma, :httpoison, Pleroma.HTTP
-version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
- "Pleroma #{Mix.Project.config[:version]} #{String.trim(version)}"
- else
- _ -> "Pleroma #{Mix.Project.config[:version]} dev"
- end
+version =
+ with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
+ "Pleroma #{Mix.Project.config()[:version]} #{String.trim(version)}"
+ else
+ _ -> "Pleroma #{Mix.Project.config()[:version]} dev"
+ end
# Configures http settings, upstream proxy etc.
-config :pleroma, :http,
- proxy_url: nil
+config :pleroma, :http, proxy_url: nil
config :pleroma, :instance,
version: version,
@@ -59,16 +55,15 @@ config :pleroma, :instance,
config :pleroma, :media_proxy,
enabled: false,
redirect_on_failure: true
- #base_url: "https://cache.pleroma.social"
-config :pleroma, :chat,
- enabled: true
+# base_url: "https://cache.pleroma.social"
+
+config :pleroma, :chat, enabled: true
config :ecto, json_library: Jason
-config :phoenix, :format_encoders,
- json: Jason
+config :phoenix, :format_encoders, json: Jason
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
-import_config "#{Mix.env}.exs"
+import_config "#{Mix.env()}.exs"
diff --git a/config/dev.exs b/config/dev.exs
index a697d3a24..7b06ad67e 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -7,7 +7,10 @@ use Mix.Config
# watchers to your application. For example, we use it
# with brunch.io to recompile .js and .css sources.
config :pleroma, Pleroma.Web.Endpoint,
- http: [port: 4000, protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]],
+ http: [
+ port: 4000,
+ protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]
+ ],
protocol: "http",
debug_errors: true,
code_reloader: true,
@@ -49,5 +52,8 @@ config :pleroma, Pleroma.Repo,
try do
import_config "dev.secret.exs"
rescue
- _-> IO.puts("!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs")
+ _ ->
+ IO.puts(
+ "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs"
+ )
end
diff --git a/config/test.exs b/config/test.exs
index 26b5410fe..e0461e93d 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,8 +9,7 @@ config :pleroma, Pleroma.Web.Endpoint,
# Print only warnings and errors during test
config :logger, level: :warn
-config :pleroma, Pleroma.Upload,
- uploads: "test/uploads"
+config :pleroma, Pleroma.Upload, uploads: "test/uploads"
# Configure your database
config :pleroma, Pleroma.Repo,
@@ -21,7 +20,6 @@ config :pleroma, Pleroma.Repo,
hostname: System.get_env("DB_HOST") || "localhost",
pool: Ecto.Adapters.SQL.Sandbox
-
# Reduce hash rounds for testing
config :comeonin, :pbkdf2_rounds, 1