From e65374c893b2425fbea65f08d6055563e348dd67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 12 Apr 2019 11:21:37 +0200 Subject: [PATCH] Add TODO prefix --- site-cookbooks/kosmos-mastodon/recipes/default.rb | 2 +- .../kosmos-mastodon/templates/default/env.production.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos-mastodon/recipes/default.rb b/site-cookbooks/kosmos-mastodon/recipes/default.rb index 14b96f2..602e3d9 100644 --- a/site-cookbooks/kosmos-mastodon/recipes/default.rb +++ b/site-cookbooks/kosmos-mastodon/recipes/default.rb @@ -10,7 +10,7 @@ include_recipe "kosmos-nodejs" include_recipe "kosmos-redis" include_recipe "kosmos-postgresql" -# Remove the condition once we have migrated mastodon to andromeda +# TODO: Remove the condition once we have migrated mastodon to andromeda unless platform?('ubuntu') && node[:platform_version].to_f < 18.04 postgresql_data_bag_item = data_bag_item('credentials', 'postgresql') diff --git a/site-cookbooks/kosmos-mastodon/templates/default/env.production.erb b/site-cookbooks/kosmos-mastodon/templates/default/env.production.erb index 11bce2f..d304c97 100644 --- a/site-cookbooks/kosmos-mastodon/templates/default/env.production.erb +++ b/site-cookbooks/kosmos-mastodon/templates/default/env.production.erb @@ -2,7 +2,7 @@ REDIS_URL=<%= @redis_url %> DB_HOST=localhost DB_NAME=mastodon -# Remove the condition once we have migrated mastodon to andromeda +# TODO: Remove the condition once we have migrated mastodon to andromeda <% if node[:platform_version].to_f < 18.04 -%> DB_USER=postgres DB_PASS=<%= node['postgresql']['password']['postgres'] %>