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

Merge branch 'master' into feature/lndhub_webhooks

Browse Source
This commit is contained in:
Greg
2023-01-17 13:44:14 +00:00
parent 89865bcd2a cdb1213e1d
commit 1a7fd5ac65
6 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,15 @@ node.default["kosmos-mastodon"]["server_name"] = "kosmos.social"
node.default["kosmos-mastodon"]["alternate_domains"] = []
node.default["kosmos-mastodon"]["redis_url"] = "redis://localhost:6379/0"
node.default["kosmos-mastodon"]["sidekiq_threads"] = 25
node.default["kosmos-mastodon"]["onion_address"] = nil
# Allocate this amount of RAM to the Java heap for Elasticsearch
node.default["kosmos-mastodon"]["elasticsearch"]["allocated_memory"] = "1536m"
node.default["kosmos-mastodon"]["s3_endpoint"] = nil
node.default["kosmos-mastodon"]["s3_region"] = nil
node.default["kosmos-mastodon"]["s3_bucket"] = nil
node.default["kosmos-mastodon"]["s3_alias_host"] = nil
node.override["redisio"]["version"] = "6.2.6"

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

@@ -166,10 +166,12 @@ application mastodon_path do
smtp_login: mastodon_credentials['smtp_user_name'],
smtp_password: mastodon_credentials['smtp_password'],
smtp_from_address: "mail@#{node['kosmos-mastodon']['server_name']}",
s3_bucket: "kosmos-social",
aws_access_key_id: mastodon_credentials['aws_access_key_id'],
aws_secret_access_key: mastodon_credentials['aws_secret_access_key'],
s3_region: "eu-west-1",
s3_endpoint: node["kosmos-mastodon"]["s3_endpoint"],
s3_region: node["kosmos-mastodon"]["s3_region"],
s3_bucket: node["kosmos-mastodon"]["s3_bucket"],
s3_alias_host: node["kosmos-mastodon"]["s3_alias_host"],
aws_access_key_id: mastodon_credentials['s3_key_id'],
aws_secret_access_key: mastodon_credentials['s3_secret_key'],
vapid_private_key: mastodon_credentials['vapid_private_key'],
vapid_public_key: mastodon_credentials['vapid_public_key'],
db_pass: postgresql_data_bag_item['mastodon_user_password'],

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

@@ -35,12 +35,16 @@ SMTP_FROM_ADDRESS=<%= @smtp_from_address %>
# Serve static files (to nginx proxy)
RAILS_SERVE_STATIC_FILES=true
<% if @s3_endpoint %>
# S3 (optional)
S3_ENABLED=true
S3_ENDPOINT=<%= @s3_endpoint %>
S3_REGION=<%= @s3_region %>
S3_BUCKET=<%= @s3_bucket %>
S3_ALIAS_HOST=<%= @s3_alias_host %>
AWS_ACCESS_KEY_ID=<%= @aws_access_key_id %>
AWS_SECRET_ACCESS_KEY=<%= @aws_secret_access_key %>
S3_REGION=<%= @s3_region %>
<% end %>
# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
# S3_CLOUDFRONT_HOST=