Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats

3 files changed, 6 insertions, 22 deletions

diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex
index ae9ac3b75..70a110561 100644
--- a/lib/mix/tasks/generate_config.ex
+++ b/lib/mix/tasks/generate_config.ex
@@ -9,20 +9,6 @@ defmodule Mix.Tasks.GenerateConfig do
     name = IO.gets("What is the name of your instance? (e.g. Pleroma/Soykaf): ") |> String.trim()
     email = IO.gets("What's your admin email address: ") |> String.trim()
 
-    mediaproxy =
-      IO.gets("Do you want to activate the mediaproxy? (y/N): ")
-      |> String.trim()
-      |> String.downcase()
-      |> String.starts_with?("y")
-
-    proxy_url =
-      if mediaproxy do
-        IO.gets("What is the mediaproxy's URL? (e.g. https://cache.example.com): ")
-        |> String.trim()
-      else
-        "https://cache.example.com"
-      end
-
     secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
     dbpass = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
 
@@ -35,8 +21,6 @@ defmodule Mix.Tasks.GenerateConfig do
         email: email,
         name: name,
         secret: secret,
-        mediaproxy: mediaproxy,
-        proxy_url: proxy_url,
         dbpass: dbpass
       )
 
diff --git a/lib/mix/tasks/rm_user.ex b/lib/mix/tasks/rm_user.ex
index aa0cf4951..6a698f360 100644
--- a/lib/mix/tasks/rm_user.ex
+++ b/lib/mix/tasks/rm_user.ex
@@ -1,14 +1,14 @@
 defmodule Mix.Tasks.RmUser do
   use Mix.Task
   import Mix.Ecto
-  alias Pleroma.User
+  alias Pleroma.{User, Repo}
 
   @shortdoc "Permanently delete a user"
   def run([nickname]) do
-    ensure_started(Repo, [])
+    Mix.Task.run("app.start")
 
     with %User{local: true} = user <- User.get_by_nickname(nickname) do
-      user.delete()
+      User.delete(user)
     end
   end
 end
diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex
index 9330fae2d..e37c864c0 100644
--- a/lib/mix/tasks/sample_config.eex
+++ b/lib/mix/tasks/sample_config.eex
@@ -11,9 +11,9 @@ config :pleroma, :instance,
   registrations_open: true
 
 config :pleroma, :media_proxy,
-  enabled: <%= mediaproxy %>,
-  redirect_on_failure: true,
-  base_url: "<%= proxy_url %>"
+  enabled: false,
+  redirect_on_failure: true
+  #base_url: "https://cache.pleroma.social"
 
 # Configure your database
 config :pleroma, Pleroma.Repo,