Add instance config options.
This commit is contained in:
parent
3aaf6608c6
commit
ac2893a945
3 changed files with 30 additions and 2 deletions
|
@ -34,6 +34,17 @@ config :pleroma, :websub, Pleroma.Web.Websub
|
||||||
config :pleroma, :ostatus, Pleroma.Web.OStatus
|
config :pleroma, :ostatus, Pleroma.Web.OStatus
|
||||||
config :pleroma, :httpoison, HTTPoison
|
config :pleroma, :httpoison, HTTPoison
|
||||||
|
|
||||||
|
version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
|
||||||
|
"Pleroma #{String.trim(version)}"
|
||||||
|
else
|
||||||
|
_ -> "Pleroma dev"
|
||||||
|
end
|
||||||
|
|
||||||
|
config :pleroma, :instance,
|
||||||
|
version: version,
|
||||||
|
name: "Pleroma",
|
||||||
|
email: "example@example.com"
|
||||||
|
|
||||||
# Import environment specific config. This must remain at the bottom
|
# Import environment specific config. This must remain at the bottom
|
||||||
# of this file so it overrides the configuration defined above.
|
# of this file so it overrides the configuration defined above.
|
||||||
import_config "#{Mix.env}.exs"
|
import_config "#{Mix.env}.exs"
|
||||||
|
|
|
@ -45,3 +45,9 @@ config :pleroma, Pleroma.Repo,
|
||||||
database: "pleroma_dev",
|
database: "pleroma_dev",
|
||||||
hostname: "localhost",
|
hostname: "localhost",
|
||||||
pool_size: 10
|
pool_size: 10
|
||||||
|
|
||||||
|
try do
|
||||||
|
import_config "dev.secret.exs"
|
||||||
|
rescue
|
||||||
|
_-> nil
|
||||||
|
end
|
||||||
|
|
|
@ -39,12 +39,23 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@instance Application.get_env(:pleroma, :instance)
|
||||||
|
|
||||||
def masto_instance(conn, _params) do
|
def masto_instance(conn, _params) do
|
||||||
response = %{
|
response = %{
|
||||||
uri: Web.base_url,
|
uri: Web.base_url,
|
||||||
title: Web.base_url,
|
title: Keyword.get(@instance, :name),
|
||||||
description: "A Pleroma instance, an alternative fediverse server",
|
description: "A Pleroma instance, an alternative fediverse server",
|
||||||
version: "Pleroma Dev"
|
version: Keyword.get(@instance, :version),
|
||||||
|
email: Keyword.get(@instance, :email),
|
||||||
|
urls: %{
|
||||||
|
streaming_api: String.replace(Web.base_url, ["http","https"], "wss")
|
||||||
|
},
|
||||||
|
stats: %{
|
||||||
|
user_count: 1,
|
||||||
|
status_count: 2,
|
||||||
|
domain_count: 3
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
json(conn, response)
|
json(conn, response)
|
||||||
|
|
Loading…
Reference in a new issue