merge develop

[akkoma] / priv / templates / sample_config.eex

diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex
index 526593d0a87f7049ada1730966febf1a01d8b291..dc75d4008e0ff631d54d9408dfbe952283c15cb6 100644 (file)
--- a/priv/templates/sample_config.eex
+++ b/priv/templates/sample_config.eex
@@ -3,7 +3,7 @@
 # NOTE: This file should not be committed to a repo or otherwise made public
 # without removing sensitive information.
 
-<%= if Code.ensure_loaded?(Config) do
+<%= if Code.ensure_loaded?(Config) or not Code.ensure_loaded?(Mix.Config) do
   "import Config"
 else
   "use Mix.Config"
@@ -11,6 +11,7 @@ end %>
 
 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 %>"
 
@@ -41,6 +42,7 @@ config :web_push_encryption, :vapid_details,
   public_key: "<%= web_push_public_key %>",
   private_key: "<%= web_push_private_key %>"
 
+config :pleroma, :database, rum_enabled: <%= rum_enabled %>
 config :pleroma, :instance, static_dir: "<%= static_dir %>"
 config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
 
@@ -67,19 +69,4 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
 # config :ex_aws, :s3,
 #   host: "s3.wasabisys.com"
 
-
-# Configure Openstack Swift support if desired.
-#
-# Many openstack deployments are different, so config is left very open with
-# no assumptions made on which provider you're using. This should allow very
-# wide support without needing separate handlers for OVH, Rackspace, etc.
-#
-# config :pleroma, Pleroma.Uploaders.Swift,
-#  container: "some-container",
-#  username: "api-username-yyyy",
-#  password: "api-key-xxxx",
-#  tenant_id: "<openstack-project/tenant-id>",
-#  auth_url: "https://keystone-endpoint.provider.com",
-#  storage_url: "https://swift-endpoint.prodider.com/v1/AUTH_<tenant>/<container>",
-#  object_url: "https://cdn-endpoint.provider.com/<container>"
-#
+config :joken, default_signer: "<%= jwt_secret %>"