Merge pull request '2024.04 - update' (#18) from 2024.04 into staging

Reviewed-on: #18
This commit is contained in:
muppeth 2024-04-28 17:54:38 +02:00
commit 2643806c9d
2 changed files with 5 additions and 1 deletions

View file

@ -44,6 +44,8 @@ pleroma_conf_from_db: 'true'
pleroma_allow_relay: 'true'
pleroma_nickname_format: 'false'
pleroma_remote_post_retention: '90'
pleroma_upload_url: '{{ pleroma_link_host }}/media'
pleroma_mediaproxy_url: '{{ pleroma_link_host }}'
pleroma_db_host: "localhost"
pleroma_db_superuser: "postgres"
pleroma_db_passwd: 'changeme'

View file

@ -25,13 +25,15 @@ config :pleroma, :instance,
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,
filters: [Pleroma.Upload.Filter.Dedupe]
filters: [Pleroma.Upload.Filter.Dedupe],
base_url: "{{ pleroma_upload_url }}"
config :pleroma, Pleroma.Uploaders.Local,
uploads: "{{ pleroma_data_dir }}/uploads/"
config :pleroma, :media_proxy,
enabled: true,
base_url: "{{ pleroma_mediaproxy_url }}",
redirect_on_failure: true
config :pleroma, Pleroma.Repo,