kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 30 Pull Requests 3 Projects 2 Activity

Update Mastodon Redis config

Browse Source 
They introduced Redis URLs for the config, so I removed our own
additions and added the URL.
This commit is contained in:
Basti 2017-06-16 12:08:44 -07:00
parent ff3d062c73
commit e39792ea36
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
site-cookbooks/kosmos-mastodon/attributes/default.rb
View File

@ -2,3 +2,4 @@ node.default["kosmos-mastodon"]["directory"] = "/opt/mastodon"
node.default["kosmos-mastodon"]["puma_port"] = 3000 node.default["kosmos-mastodon"]["puma_port"] = 3000
node.default["kosmos-mastodon"]["streaming_port"] = 4000 node.default["kosmos-mastodon"]["streaming_port"] = 4000
node.default["kosmos-mastodon"]["server_name"] = "kosmos.social" node.default["kosmos-mastodon"]["server_name"] = "kosmos.social"
node.default["kosmos-mastodon"]["redis_url"] = "redis://localhost:6379/1"

3
site-cookbooks/kosmos-mastodon/recipes/default.rb
View File

@ -71,8 +71,7 @@ application mastodon_path do
mode "0640" mode "0640"
owner "mastodon" owner "mastodon"
group "mastodon" group "mastodon"
variables redis_db: 1, variables redis_url: node["kosmos-mastodon"]["redis_url"],
redis_actioncable_db: 2,
domain: node["kosmos-mastodon"]["server_name"], domain: node["kosmos-mastodon"]["server_name"],
paperclip_secret: mastodon_credentials['paperclip_secret'], paperclip_secret: mastodon_credentials['paperclip_secret'],
secret_key_base: mastodon_credentials['secret_key_base'], secret_key_base: mastodon_credentials['secret_key_base'],

5
site-cookbooks/kosmos-mastodon/templates/default/env.production.erb
View File

@ -1,8 +1,5 @@
# Service dependencies # Service dependencies
REDIS_HOST=localhost REDIS_URL=<%= @redis_url %>
REDIS_PORT=6379
REDIS_DB=<%= @redis_db %>
REDIS_ACTIONCABLE_DB=<%= @redis_actioncable_db %>
DB_HOST=localhost DB_HOST=localhost
DB_USER=postgres DB_USER=postgres
DB_NAME=mastodon DB_NAME=mastodon