Update Chef to 14.11.21 #27

Merged
greg merged 44 commits from chef_14 into master 2019-04-12 11:31:37 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit e65374c893 - Show all commits

View File

@ -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')

View File

@ -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

Would be easier to find with TODO prefix.

Would be easier to find with TODO prefix.
<% if node[:platform_version].to_f < 18.04 -%>
DB_USER=postgres
DB_PASS=<%= node['postgresql']['password']['postgres'] %>