diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 11 | ||||
| -rw-r--r-- | config/dev.exs | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 8f6fe00fb..3861f9901 100644 --- a/config/config.exs +++ b/config/config.exs @@ -34,6 +34,17 @@ config :pleroma, :websub, Pleroma.Web.Websub config :pleroma, :ostatus, Pleroma.Web.OStatus 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 # of this file so it overrides the configuration defined above. import_config "#{Mix.env}.exs" diff --git a/config/dev.exs b/config/dev.exs index 6adde84a2..126baea28 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -45,3 +45,9 @@ config :pleroma, Pleroma.Repo, database: "pleroma_dev", hostname: "localhost", pool_size: 10 + +try do + import_config "dev.secret.exs" +rescue + _-> nil +end |