From cfa28dee32d3608cab2e2fb42a59c50f3cc0c083 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Tue, 25 Feb 2020 21:59:37 +0300 Subject: [PATCH 1/3] instance.gen task: make instance name default to the domain --- lib/mix/tasks/pleroma/instance.ex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index 2d8b8d673..fee2ab9d9 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -65,7 +65,8 @@ def run(["gen" | rest]) do get_option( options, :instance_name, - "What is the name of your instance? (e.g. Pleroma/Soykaf)" + "What is the name of your instance? (e.g. Pleroma/Soykaf)", + domain ) email = get_option(options, :admin_email, "What is your admin email address?") From 359faa8645b48c05e5b477e43d144ed4ac92b249 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Tue, 25 Feb 2020 22:13:08 +0300 Subject: [PATCH 2/3] instance.gen task: remind to transfer the config to the database after migrations --- lib/mix/tasks/pleroma/instance.ex | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index fee2ab9d9..216dec296 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -207,8 +207,14 @@ def run(["gen" | rest]) do write_robots_txt(indexable, template_dir) shell_info( - "\n All files successfully written! Refer to the installation instructions for your platform for next steps" + "\n All files successfully written! Refer to the installation instructions for your platform for next steps." ) + + if db_configurable? do + shell_info( + " Please transfer your config to the database after running database migrations. Refer to \"Transfering the config to/from the database\" section of the docs for more information." + ) + end else shell_error( "The task would have overwritten the following files:\n" <> From 3bbfebd1c2f0e997a16c7938dd09b1621918cd12 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 26 Feb 2020 00:32:34 +0300 Subject: [PATCH 3/3] instance.gen task: make example instance name less confusing See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217 --- lib/mix/tasks/pleroma/instance.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index 216dec296..54d34e42f 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -65,7 +65,7 @@ def run(["gen" | rest]) do get_option( options, :instance_name, - "What is the name of your instance? (e.g. Pleroma/Soykaf)", + "What is the name of your instance? (e.g. The Corndog Emporium)", domain )