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

Merge branch 'admin-be' into 'develop'

Browse source 
Config api for admin-fe

Closes #1406

See merge request pleroma/pleroma!1976
This commit is contained in:
feld 2020-01-22 17:13:17 +00:00
commit be27777156
35 changed files with 3635 additions and 1416 deletions
Download patch file Download diff file Expand all files Collapse all files

5
priv/templates/sample_config.eex
View file

@ -20,8 +20,7 @@ config :pleroma, :instance,
email: "<%= email %>",
notify_email: "<%= notify_email %>",
limit: 5000,
registrations_open: true,
dynamic_configuration: <%= db_configurable? %>
registrations_open: true
config :pleroma, :media_proxy,
enabled: false,
@ -70,3 +69,5 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
# host: "s3.wasabisys.com"
config :joken, default_signer: "<%= jwt_secret %>"
config :pleroma, configurable_from_database: <%= db_configurable? %>