summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-28 16:45:21 +0000
committerlain <lain@soykaf.club>2020-07-28 16:45:21 +0000
commit165ea038bd7a057ce137cc6a7a3deee7c98753de (patch)
treeea48fe058ec74ed292d9bab4b5a1e8a508d79725 /config
parent68b33723450c0034efc79db5cc51b10c29e2351d (diff)
parent81350faa8eea925a323144dcc0cfe38970132acf (diff)
downloadpleroma-165ea038bd7a057ce137cc6a7a3deee7c98753de.tar.gz
pleroma-165ea038bd7a057ce137cc6a7a3deee7c98753de.zip
Merge branch 'frontend-bundles-redux' into 'develop'
Changeable frontends MVP See merge request pleroma/pleroma!2801
Diffstat (limited to 'config')
-rw-r--r--config/config.exs9
-rw-r--r--config/description.exs25
2 files changed, 34 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index acf3b5c96..09dd9e786 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -645,6 +645,15 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true
config :pleroma, :static_fe, enabled: false
+# Example of frontend configuration
+# This example will make us serve the primary frontend from the
+# `/frontends/pleroma/develop` folder in your instance static directory.
+#
+# With no frontend configuration, the bundled files from the `static` directory will
+# be used.
+#
+# config :pleroma, :frontends, primary: %{"name" => "pleroma", "ref" => "develop"}
+
config :pleroma, :web_cache_ttl,
activity_pub: nil,
activity_pub_question: 30_000
diff --git a/config/description.exs b/config/description.exs
index c303fc878..91261c1e1 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -3481,5 +3481,30 @@ config :pleroma, :config_description, [
suggestions: ["s3.eu-central-1.amazonaws.com"]
}
]
+ },
+ %{
+ group: :pleroma,
+ key: :frontends,
+ type: :group,
+ description: "Installed frontends management",
+ children: [
+ %{
+ key: :primary,
+ type: :map,
+ description: "Primary frontend, the one that is served for all pages by default",
+ children: [
+ %{
+ key: "name",
+ type: :string,
+ description: "Name of the installed primary frontend"
+ },
+ %{
+ key: "ref",
+ type: :string,
+ description: "reference of the installed primary frontend to be used"
+ }
+ ]
+ }
+ ]
}
]