hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into shigusegubu

Browse source
This commit is contained in:
SGSGB 2018-08-04 18:24:38 +02:00
commit 2c15ffb421
43 changed files with 383 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

20
config/config.exs
View file

@ -10,7 +10,11 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
config :pleroma, Pleroma.Upload, uploads: "uploads"
config :pleroma, Pleroma.Upload,
uploads: "uploads",
strip_exif: false
config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
@ -50,6 +54,7 @@ config :pleroma, :instance,
version: version,
name: "Shigusegubu",
email: "pleroma@hjkos.com",
description: "SigSegV, a pleroma instance",
limit: 5000,
upload_limit: 20_000_000,
registrations_open: true,
@ -58,6 +63,19 @@ config :pleroma, :instance,
public: true,
quarantined_instances: ["pleroma.rareome.ga"]
config :pleroma, :fe,
theme: "pleroma-dark",
logo: "/static/logo.png",
background: "/static/aurora_borealis.jpg",
redirect_root_no_login: "/main/all",
redirect_root_login: "/main/friends",
show_instance_panel: true,
show_who_to_follow_panel: false,
who_to_follow_provider:
"https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
who_to_follow_link: "https://vinayaka.distsn.org/?{{host}}+{{user}}",
scope_options_enabled: false
config :pleroma, :activitypub,
accept_blocks: true,
unfollow_blocked: true,