From 4e3fc530db616655e0d372e5f91ab992582f20d1 Mon Sep 17 00:00:00 2001 From: eal Date: Wed, 18 Apr 2018 17:39:27 +0300 Subject: Fix rm_user task. --- lib/mix/tasks/rm_user.ex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/mix/tasks') diff --git a/lib/mix/tasks/rm_user.ex b/lib/mix/tasks/rm_user.ex index aa0cf4951..96d112cfe 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, []) with %User{local: true} = user <- User.get_by_nickname(nickname) do - user.delete() + User.delete(user) end end end -- cgit v1.2.3 From b586ead6b815897e1993c4977aeafa0338a3945b Mon Sep 17 00:00:00 2001 From: eal Date: Wed, 18 Apr 2018 17:52:25 +0300 Subject: rm_user: also ensure that cache is running. --- lib/mix/tasks/rm_user.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/mix/tasks') diff --git a/lib/mix/tasks/rm_user.ex b/lib/mix/tasks/rm_user.ex index 96d112cfe..6a698f360 100644 --- a/lib/mix/tasks/rm_user.ex +++ b/lib/mix/tasks/rm_user.ex @@ -5,7 +5,7 @@ defmodule Mix.Tasks.RmUser do @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) -- cgit v1.2.3 From e30a056476d7b13681023cd6490aeea2fd3b4285 Mon Sep 17 00:00:00 2001 From: eal Date: Thu, 19 Apr 2018 13:29:14 +0300 Subject: Revert "Ask for proxy URL if proxy enabled." The most common case is running it on the same server. --- lib/mix/tasks/generate_config.ex | 8 -------- lib/mix/tasks/sample_config.eex | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'lib/mix/tasks') diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex index ae9ac3b75..bfd18d22e 100644 --- a/lib/mix/tasks/generate_config.ex +++ b/lib/mix/tasks/generate_config.ex @@ -15,14 +15,6 @@ defmodule Mix.Tasks.GenerateConfig do |> 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) diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex index 9330fae2d..05f11c95d 100644 --- a/lib/mix/tasks/sample_config.eex +++ b/lib/mix/tasks/sample_config.eex @@ -13,7 +13,7 @@ config :pleroma, :instance, config :pleroma, :media_proxy, enabled: <%= mediaproxy %>, redirect_on_failure: true, - base_url: "<%= proxy_url %>" + #base_url: "https://cache.pleroma.social" # Configure your database config :pleroma, Pleroma.Repo, -- cgit v1.2.3 From 77fc40d5d737864e1530b212fb3f3453e6122dbc Mon Sep 17 00:00:00 2001 From: lain Date: Thu, 19 Apr 2018 12:50:25 +0200 Subject: Fix generate config --- lib/mix/tasks/generate_config.ex | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib/mix/tasks') diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex index bfd18d22e..70a110561 100644 --- a/lib/mix/tasks/generate_config.ex +++ b/lib/mix/tasks/generate_config.ex @@ -9,12 +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") - secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64) dbpass = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64) @@ -27,8 +21,6 @@ defmodule Mix.Tasks.GenerateConfig do email: email, name: name, secret: secret, - mediaproxy: mediaproxy, - proxy_url: proxy_url, dbpass: dbpass ) -- cgit v1.2.3 From 7b96a756fbcc6f814e70ad1b9ad6bd45844ea734 Mon Sep 17 00:00:00 2001 From: lain Date: Thu, 19 Apr 2018 13:04:29 +0200 Subject: fix again --- lib/mix/tasks/sample_config.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/mix/tasks') diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex index 05f11c95d..f563b01d7 100644 --- a/lib/mix/tasks/sample_config.eex +++ b/lib/mix/tasks/sample_config.eex @@ -11,7 +11,7 @@ config :pleroma, :instance, registrations_open: true config :pleroma, :media_proxy, - enabled: <%= mediaproxy %>, + enabled: false, redirect_on_failure: true, #base_url: "https://cache.pleroma.social" -- cgit v1.2.3 From 0b4ff1bfe273f89880c1ef02e9e39dddcf7bcf50 Mon Sep 17 00:00:00 2001 From: lain Date: Thu, 19 Apr 2018 21:44:11 +0200 Subject: fix again --- lib/mix/tasks/sample_config.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/mix/tasks') diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex index f563b01d7..e37c864c0 100644 --- a/lib/mix/tasks/sample_config.eex +++ b/lib/mix/tasks/sample_config.eex @@ -12,7 +12,7 @@ config :pleroma, :instance, config :pleroma, :media_proxy, enabled: false, - redirect_on_failure: true, + redirect_on_failure: true #base_url: "https://cache.pleroma.social" # Configure your database -- cgit v1.2.3