Merge branch 'feat/instance-gen-improvements' into 'develop'

small instance.gen task improvements

See merge request pleroma/pleroma!2245
This commit is contained in:
lain 2020-02-26 08:26:16 +00:00
commit fda6f35a46
1 changed files with 9 additions and 2 deletions

View File

@ -65,7 +65,8 @@ def run(["gen" | rest]) do
get_option( get_option(
options, options,
:instance_name, :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
) )
email = get_option(options, :admin_email, "What is your admin email address?") email = get_option(options, :admin_email, "What is your admin email address?")
@ -206,8 +207,14 @@ def run(["gen" | rest]) do
write_robots_txt(indexable, template_dir) write_robots_txt(indexable, template_dir)
shell_info( 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 else
shell_error( shell_error(
"The task would have overwritten the following files:\n" <> "The task would have overwritten the following files:\n" <>