diff options
| author | lain <lain@soykaf.club> | 2018-11-30 17:34:20 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-11-30 17:34:20 +0100 |
| commit | d0ec2812bd347469ebce8a4606953bd6c901db80 (patch) | |
| tree | d8c77602411b24350afaa10f9b95a9d1cd7af7b2 /config | |
| parent | 8f1fffebc6796f2e0758a99d032ab3db7f2f6e0b (diff) | |
| parent | 52ce368562de919f1806dfd5235642caf0666e16 (diff) | |
| download | pleroma-d0ec2812bd347469ebce8a4606953bd6c901db80.tar.gz pleroma-d0ec2812bd347469ebce8a4606953bd6c901db80.zip | |
Merge remote-tracking branch 'origin' into validate-user-info
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 9 | ||||
| -rw-r--r-- | config/config.md | 13 |
2 files changed, 14 insertions, 8 deletions
diff --git a/config/config.exs b/config/config.exs index af0fdca9a..848c9d6cf 100644 --- a/config/config.exs +++ b/config/config.exs @@ -52,6 +52,7 @@ config :pleroma, Pleroma.Web.Endpoint, url: [host: "localhost"], protocol: "https", secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl", + signing_salt: "CqaoopA2", render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)], pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2], secure_cookie_flag: true @@ -72,18 +73,10 @@ 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 - # Configures http settings, upstream proxy etc. config :pleroma, :http, proxy_url: nil config :pleroma, :instance, - version: version, name: "Pleroma", email: "example@example.com", description: "A Pleroma instance, an alternative fediverse server", diff --git a/config/config.md b/config/config.md index 5b4110646..c843bca5d 100644 --- a/config/config.md +++ b/config/config.md @@ -87,3 +87,16 @@ This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:i * ``sts_max_age``: The maximum age for the `Strict-Transport-Security` header if sent * ``ct_max_age``: The maximum age for the `Expect-CT` header if sent * ``referrer_policy``: The referrer policy to use, either `"same-origin"` or `"no-referrer"`. + +## :mrf_user_allowlist + +The keys in this section are the domain names that the policy should apply to. +Each key should be assigned a list of users that should be allowed through by +their ActivityPub ID. + +An example: + +``` +config :pleroma, :mrf_user_allowlist, + "example.org": ["https://example.org/users/admin"] +``` |