X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fdocker.exs;h=f9f27d141511ea8c3836a880869c38c670953075;hb=8fe59d495df0c7fb999579b214f0b241835211b2;hp=c07f0b75333d882fa1e3d9a5fb5c0837c6ba011e;hpb=4a418698db71016447f2f246f7c5579b3dc0b08c;p=akkoma

diff --git a/config/docker.exs b/config/docker.exs
index c07f0b753..f9f27d141 100644
--- a/config/docker.exs
+++ b/config/docker.exs
@@ -1,8 +1,8 @@
 import Config
 
 config :pleroma, Pleroma.Web.Endpoint,
-   url: [host: System.get_env("DOMAIN", "localhost"), scheme: "https", port: 443],
-   http: [ip: {0, 0, 0, 0}, port: 4000]
+  url: [host: System.get_env("DOMAIN", "localhost"), scheme: "https", port: 443],
+  http: [ip: {0, 0, 0, 0}, port: 4000]
 
 config :pleroma, :instance,
   name: System.get_env("INSTANCE_NAME", "Pleroma"),
@@ -10,7 +10,7 @@ config :pleroma, :instance,
   notify_email: System.get_env("NOTIFY_EMAIL"),
   limit: 5000,
   registrations_open: false,
-  dynamic_configuration: true
+  healthcheck: true
 
 config :pleroma, Pleroma.Repo,
   adapter: Ecto.Adapters.Postgres,
@@ -21,8 +21,7 @@ config :pleroma, Pleroma.Repo,
   pool_size: 10
 
 # Configure web push notifications
-config :web_push_encryption, :vapid_details,
-  subject: "mailto:#{System.get_env("NOTIFY_EMAIL")}"
+config :web_push_encryption, :vapid_details, subject: "mailto:#{System.get_env("NOTIFY_EMAIL")}"
 
 config :pleroma, :database, rum_enabled: false
 config :pleroma, :instance, static_dir: "/var/lib/pleroma/static"
@@ -34,23 +33,24 @@ if not File.exists?("/var/lib/pleroma/secret.exs") do
   signing_salt = :crypto.strong_rand_bytes(8) |> Base.encode64() |> binary_part(0, 8)
   {web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1)
 
-  secret_file = EEx.eval_string(
-    """
-    import Config
-    
-    config :pleroma, Pleroma.Web.Endpoint,
-      secret_key_base: "<%= secret %>",
-      signing_salt: "<%= signing_salt %>"
-    
-    config :web_push_encryption, :vapid_details,
-      public_key: "<%= web_push_public_key %>",
-      private_key: "<%= web_push_private_key %>"
-    """,
-    secret: secret,
-    signing_salt: signing_salt,
-    web_push_public_key: Base.url_encode64(web_push_public_key, padding: false),
-    web_push_private_key: Base.url_encode64(web_push_private_key, padding: false)
-  )
+  secret_file =
+    EEx.eval_string(
+      """
+      import Config
+
+      config :pleroma, Pleroma.Web.Endpoint,
+        secret_key_base: "<%= secret %>",
+        signing_salt: "<%= signing_salt %>"
+
+      config :web_push_encryption, :vapid_details,
+        public_key: "<%= web_push_public_key %>",
+        private_key: "<%= web_push_private_key %>"
+      """,
+      secret: secret,
+      signing_salt: signing_salt,
+      web_push_public_key: Base.url_encode64(web_push_public_key, padding: false),
+      web_push_private_key: Base.url_encode64(web_push_private_key, padding: false)
+    )
 
   File.write("/var/lib/pleroma/secret.exs", secret_file)
 end
@@ -60,8 +60,9 @@ import_config("/var/lib/pleroma/secret.exs")
 # For additional user config
 if File.exists?("/var/lib/pleroma/config.exs"),
   do: import_config("/var/lib/pleroma/config.exs"),
-  else: File.write("/var/lib/pleroma/config.exs", """
-  import Config
-  
-  # For additional configuration outside of environmental variables
-  """)
+  else:
+    File.write("/var/lib/pleroma/config.exs", """
+    import Config
+
+    # For additional configuration outside of environmental variables
+    """)