Skip to content

Commit fad4cd4

Browse files
ClearlyClairejesseplusplus
authored andcommitted
Fix mastodon:setup to take dotenv/docker-compose differences into account (mastodon#16896)
In order to work around mastodon#16895, add a warning to .env.production.sample, and change the mastodon:setup rake task to: - output a warning if a variable will be interpreted differently by dotenv and docker-compose - ensure the printed config is compatible with docker-compose
1 parent f9c0afc commit fad4cd4

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

lib/tasks/mastodon.rake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,11 @@ namespace :mastodon do
350350
end
351351
end.join("\n")
352352

353-
generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n".dup
353+
generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n"
354354

355355
if incompatible_syntax
356-
generated_header << "# Some variables in this file will be interpreted differently whether you are\n"
357-
generated_header << "# using docker-compose or not.\n\n"
356+
generated_header << "Some variables in this file will be interpreted differently whether you are\n"
357+
generated_header << "using docker-compose or not.\n\n"
358358
end
359359

360360
File.write(Rails.root.join('.env.production'), "#{generated_header}#{env_contents}\n")

0 commit comments

Comments
 (0)