re-add gopher to URLs, fix markdown
ci/woodpecker/push/release Pipeline was successful Details
ci/woodpecker/push/lint Pipeline was successful Details
ci/woodpecker/pr/release Pipeline was successful Details
ci/woodpecker/pr/lint Pipeline was successful Details
ci/woodpecker/pr/test Pipeline was successful Details
ci/woodpecker/push/test Pipeline failed Details

This commit is contained in:
FloatingGhost 2022-06-29 12:12:48 +01:00
parent 1c8a2cf901
commit 22090b2fd1
2 changed files with 23 additions and 25 deletions

View File

@ -97,6 +97,7 @@ config :pleroma, :uri_schemes,
"http", "http",
"dat", "dat",
"dweb", "dweb",
"gopher",
"hyper", "hyper",
"ipfs", "ipfs",
"ipns", "ipns",
@ -148,7 +149,7 @@ config :pleroma, Pleroma.Web.Endpoint,
] ]
# Configures Elixir's Logger # Configures Elixir's Logger
config :logger, truncate: 65536 config :logger, truncate: 65_536
config :logger, :console, config :logger, :console,
level: :info, level: :info,
@ -187,7 +188,7 @@ config :pleroma, :instance,
name: "Pleroma", name: "Pleroma",
email: "example@example.com", email: "example@example.com",
notify_email: "noreply@example.com", notify_email: "noreply@example.com",
description: "Pleroma: An efficient and flexible fediverse server", description: "Akkoma: The cooler fediverse server",
background_image: "/images/city.jpg", background_image: "/images/city.jpg",
instance_thumbnail: "/instance/thumbnail.jpeg", instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000, limit: 5_000,
@ -602,7 +603,8 @@ config :pleroma, :ldap,
uid: System.get_env("LDAP_UID") || "cn" uid: System.get_env("LDAP_UID") || "cn"
oauth_consumer_strategies = oauth_consumer_strategies =
System.get_env("OAUTH_CONSUMER_STRATEGIES") "OAUTH_CONSUMER_STRATEGIES"
|> System.get_env()
|> to_string() |> to_string()
|> String.split() |> String.split()
|> Enum.map(&hd(String.split(&1, ":"))) |> Enum.map(&hd(String.split(&1, ":")))
@ -699,7 +701,7 @@ config :pleroma, Pleroma.Web.Plugs.RemoteIp,
"192.168.0.0/16" "192.168.0.0/16"
] ]
config :pleroma, :static_fe, enabled: false config :pleroma, :static_fe, enabled: true
# Example of frontend configuration # Example of frontend configuration
# This example will make us serve the primary frontend from the # This example will make us serve the primary frontend from the
@ -712,17 +714,15 @@ config :pleroma, :static_fe, enabled: false
# config :pleroma, :frontends, # config :pleroma, :frontends,
# primary: %{"name" => "pleroma-fe", "ref" => "develop"}, # primary: %{"name" => "pleroma-fe", "ref" => "develop"},
# admin: %{"name" => "admin-fe", "ref" => "stable"}, # admin: %{"name" => "admin-fe", "ref" => "stable"},
# mastodon: %{"enabled" => true, "name" => "mastodon-fe", "ref" => "develop"}
# available: %{...} # available: %{...}
config :pleroma, :frontends, config :pleroma, :frontends,
primary: %{
"name" => "pleroma-fe",
"ref" => "develop"
},
available: %{ available: %{
"kenoma" => %{
"name" => "kenoma",
"git" => "https://git.pleroma.social/lambadalambda/kenoma",
"build_url" =>
"https://git.pleroma.social/lambadalambda/kenoma/-/jobs/artifacts/${ref}/download?job=build",
"ref" => "master"
},
"pleroma-fe" => %{ "pleroma-fe" => %{
"name" => "pleroma-fe", "name" => "pleroma-fe",
"git" => "https://akkoma.dev/AkkomaGang/pleroma-fe", "git" => "https://akkoma.dev/AkkomaGang/pleroma-fe",
@ -730,21 +730,18 @@ config :pleroma, :frontends,
"ref" => "develop", "ref" => "develop",
"build_dir" => "dist" "build_dir" => "dist"
}, },
"fedi-fe" => %{ # mastodon-Fe cannot be set as a primary - this is only here so we can update this seperately
"name" => "fedi-fe", "mastodon-fe" => %{
"git" => "https://git.pleroma.social/pleroma/fedi-fe", "name" => "mastodon-fe",
"build_url" => "git" => "https://akkoma.dev/AkkomaGang/masto-fe",
"https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build", "build_url" => "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/masto-fe.zip",
"ref" => "master", "build_dir" => "distribution",
"custom-http-headers" => [ "ref" => "develop"
{"service-worker-allowed", "/"}
]
}, },
"admin-fe" => %{ "admin-fe" => %{
"name" => "admin-fe", "name" => "admin-fe",
"git" => "https://git.pleroma.social/pleroma/admin-fe", "git" => "https://akkoma.dev/AkkomaGang/admin-fe",
"build_url" => "build_url" => "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/admin-fe.zip",
"https://git.pleroma.social/pleroma/admin-fe/-/jobs/artifacts/${ref}/download?job=build",
"ref" => "develop" "ref" => "develop"
}, },
"soapbox-fe" => %{ "soapbox-fe" => %{

View File

@ -1,10 +1,11 @@
# Migrating to Akkoma # Migrating to Akkoma
**Akkoma does not currently have a stable release, until 3.0, all builds should be considered "develop** **Akkoma does not currently have a stable release, until 3.0, all builds should be considered "develop"**
## Why should you migrate? ## Why should you migrate?
aside from actually responsive maintainer(s)? let's lookie here, we've got aside from actually responsive maintainer(s)? let's lookie here, we've got:
- custom emoji reactions - custom emoji reactions
- misskey markdown (MFM) rendering and posting support - misskey markdown (MFM) rendering and posting support
- elasticsearch support (because pleroma search is GARBAGE) - elasticsearch support (because pleroma search is GARBAGE)