From 03fcf225e9723c8945d662cc2e96bffdcf60810a Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Fri, 15 Jul 2022 11:58:35 +0100 Subject: [PATCH] suggest using stable frontends --- config/config.exs | 11 ++++++----- docs/docs/administration/updating.md | 2 +- docs/docs/configuration/frontend_management.md | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config/config.exs b/config/config.exs index dddb5cea5..dfdffef51 100644 --- a/config/config.exs +++ b/config/config.exs @@ -718,7 +718,8 @@ config :pleroma, :static_fe, enabled: false # available: %{...} config :pleroma, :frontends, - primary: %{"name" => "pleroma-fe", "ref" => "develop"}, + primary: %{"name" => "pleroma-fe", "ref" => "stable"}, + admin: %{"name" => "admin-fe", "ref" => "stable"}, swagger: %{ "name" => "swagger-ui", "ref" => "stable", @@ -728,8 +729,8 @@ config :pleroma, :frontends, "pleroma-fe" => %{ "name" => "pleroma-fe", "git" => "https://akkoma.dev/AkkomaGang/pleroma-fe", - "build_url" => "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/akkoma-fe.zip", - "ref" => "develop", + "build_url" => "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/${ref}/akkoma-fe.zip", + "ref" => "stable", "build_dir" => "dist" }, # Mastodon-Fe cannot be set as a primary - this is only here so we can update this seperately @@ -743,8 +744,8 @@ config :pleroma, :frontends, "admin-fe" => %{ "name" => "admin-fe", "git" => "https://akkoma.dev/AkkomaGang/admin-fe", - "build_url" => "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/admin-fe.zip", - "ref" => "develop" + "build_url" => "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/${ref}/admin-fe.zip", + "ref" => "stable" }, "soapbox-fe" => %{ "name" => "soapbox-fe", diff --git a/docs/docs/administration/updating.md b/docs/docs/administration/updating.md index 7c2cd2a16..6f7ffcd63 100644 --- a/docs/docs/administration/updating.md +++ b/docs/docs/administration/updating.md @@ -8,7 +8,7 @@ Besides that, doing the following is generally enough: ```sh # Download the new release -su akkoma -s $SHELL -lc "./bin/pleroma_ctl update --branch develop" +su akkoma -s $SHELL -lc "./bin/pleroma_ctl update" # Migrate the database, you are advised to stop the instance before doing that su akkoma -s $SHELL -lc "./bin/pleroma_ctl migrate" diff --git a/docs/docs/configuration/frontend_management.md b/docs/docs/configuration/frontend_management.md index 522cd37c5..a25120589 100644 --- a/docs/docs/configuration/frontend_management.md +++ b/docs/docs/configuration/frontend_management.md @@ -14,11 +14,11 @@ Example: config :pleroma, :frontends, primary: %{ "name" => "pleroma-fe", - "ref" => "develop" + "ref" => "stable" }, admin: %{ "name" => "admin-fe", - "ref" => "develop" + "ref" => "stable" } ```