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/sample_config.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/mix/tasks/sample_config.eex') 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 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/sample_config.eex') 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/sample_config.eex') 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