From bcecdc3ab194135d5bc17496b8091a6c17775c87 Mon Sep 17 00:00:00 2001
From: href <href@random.sh>
Date: Fri, 16 Nov 2018 21:35:08 +0100
Subject: Various runtime configuration fixes

---
 config/config.exs | 1 +
 config/prod.exs   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index af0fdca9a..faeac8ed1 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
diff --git a/config/prod.exs b/config/prod.exs
index d0cfd1ac2..e5e5a977e 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -14,6 +14,7 @@ use Mix.Config
 # manifest is generated by the mix phoenix.digest task
 # which you typically run after static files are built.
 config :pleroma, Pleroma.Web.Endpoint,
+  server: true,
   http: [port: 4000],
   protocol: "http"
 
-- 
cgit v1.2.3


From bc5cf2c1926225a43589abf330fe984ea439cb00 Mon Sep 17 00:00:00 2001
From: href <href@random.sh>
Date: Tue, 20 Nov 2018 17:55:03 +0100
Subject: Improved version string

---
 config/config.exs | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index af0fdca9a..ac841d907 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -72,18 +72,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",
-- 
cgit v1.2.3


From 6979eeda34a7c9c201c0816f322c3a29c6d947e6 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Mon, 26 Nov 2018 23:54:46 +0000
Subject: config: document mrf_user_allowlist

---
 config/config.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'config')

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"]
+```
-- 
cgit v1.2.3


From 761ed2355fceccbc267af3d8e0784b07c288819e Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Fri, 30 Nov 2018 03:05:34 +0100
Subject: config/prod.exs: Remove server: true

This breaks mix tasks in regular Elixir
---
 config/prod.exs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'config')

diff --git a/config/prod.exs b/config/prod.exs
index e5e5a977e..d0cfd1ac2 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -14,7 +14,6 @@ use Mix.Config
 # manifest is generated by the mix phoenix.digest task
 # which you typically run after static files are built.
 config :pleroma, Pleroma.Web.Endpoint,
-  server: true,
   http: [port: 4000],
   protocol: "http"
 
-- 
cgit v1.2.3