Merge branch 'develop' into stable

[akkoma] / config / docker.exs

diff --git a/config/docker.exs b/config/docker.exs
index c07f0b75333d882fa1e3d9a5fb5c0837c6ba011e..fc24a4d67d059deb35d4c52a8601812009ccee12 100644 (file)
--- 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,47 +21,48 @@ 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"
-config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
+config :pleroma, :instance, static_dir: "/var/lib/akkoma/static"
+config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/akkoma/uploads"
 
 # We can't store the secrets in this file, since this is baked into the docker image
-if not File.exists?("/var/lib/pleroma/secret.exs") do
+if not File.exists?("/var/lib/akkoma/secret.exs") do
   secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
   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)
+  File.write("/var/lib/akkoma/secret.exs", secret_file)
 end
 
-import_config("/var/lib/pleroma/secret.exs")
+import_config("/var/lib/akkoma/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
-  """)
+if File.exists?("/var/lib/akkoma/config.exs"),
+  do: import_config("/var/lib/akkoma/config.exs"),
+  else:
+    File.write("/var/lib/akkoma/config.exs", """
+    import Config
+
+    # For additional configuration outside of environmental variables
+    """)