projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into restrict-domain
[akkoma]
/
priv
/
templates
/
sample_config.eex
diff --git
a/priv/templates/sample_config.eex
b/priv/templates/sample_config.eex
index 5b4dad648aa8a1d08c7ec89c51c134939587b04b..cdddc47eab0384cb97927cdbc2dacd0eb548da66 100644
(file)
--- a/
priv/templates/sample_config.eex
+++ b/
priv/templates/sample_config.eex
@@
-11,6
+11,7
@@
end %>
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],
+ http: [ip: {<%= String.replace(listen_ip, ".", ", ") %>}, port: <%= listen_port %>],
secret_key_base: "<%= secret %>",
signing_salt: "<%= signing_salt %>"
secret_key_base: "<%= secret %>",
signing_salt: "<%= signing_salt %>"
@@
-19,8
+20,7
@@
config :pleroma, :instance,
email: "<%= email %>",
notify_email: "<%= notify_email %>",
limit: 5000,
email: "<%= email %>",
notify_email: "<%= notify_email %>",
limit: 5000,
- registrations_open: true,
- dynamic_configuration: <%= db_configurable? %>
+ registrations_open: true
config :pleroma, :media_proxy,
enabled: false,
config :pleroma, :media_proxy,
enabled: false,
@@
-69,3
+69,9
@@
config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
# host: "s3.wasabisys.com"
config :joken, default_signer: "<%= jwt_secret %>"
# host: "s3.wasabisys.com"
config :joken, default_signer: "<%= jwt_secret %>"
+
+config :pleroma, configurable_from_database: <%= db_configurable? %>
+
+<%= if Kernel.length(upload_filters) > 0 do
+"config :pleroma, Pleroma.Upload, filters: #{inspect(upload_filters)}"
+end %>