Merge pull request 'Move Mastodon to new VM on fornax' (#383) from chore/mastodon_move into master

Reviewed-on: #383
This commit was merged in pull request #383.
This commit is contained in:
2022-02-10 21:32:56 +00:00
8 changed files with 108 additions and 11 deletions

View File

@@ -9,6 +9,8 @@ node.default["kosmos-mastodon"]["sidekiq_threads"] = 25
# Allocate this amount of RAM to the Java heap for Elasticsearch
node.default["kosmos-mastodon"]["elasticsearch"]["allocated_memory"] = "1536m"
node.override["redisio"]["version"] = "6.2.6"
node.override["tor"]["HiddenServices"]["mastodon"] = {
"HiddenServicePorts" => ["80 127.0.0.1:80", "443 127.0.0.1:443"]
}

View File

@@ -8,7 +8,7 @@ version '0.2.1'
depends "kosmos-nginx"
depends "kosmos-nodejs"
depends "kosmos-redis"
depends 'redisio'
depends "poise-ruby-build"
depends "application"
depends "application_git"

View File

@@ -4,8 +4,9 @@
#
include_recipe "kosmos-nodejs"
include_recipe "kosmos-redis"
include_recipe "java"
include_recipe 'redisio::default'
include_recipe 'redisio::enable'
elasticsearch_user 'elasticsearch'

View File

@@ -1,14 +1,14 @@
[Unit]
Description=mastodon-sidekiq-scheduler
Requires=redis-server.service
After=redis-server.service
Requires=redis@6379.service
After=redis@6379.service
[Service]
Type=simple
User=<%= @user %>
WorkingDirectory=<%= @app_dir %>
Environment="RAILS_ENV=production"
Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1"
Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
ExecStart=<%= @bundle_path %> exec sidekiq -c <%= @sidekiq_threads %> -q scheduler
TimeoutSec=15
Restart=always

View File

@@ -1,7 +1,7 @@
[Unit]
Description=mastodon-sidekiq
Requires=redis-server.service
After=redis-server.service
Requires=redis@6379.service
After=redis@6379.service
[Service]
Type=simple
@@ -9,7 +9,7 @@ User=<%= @user %>
WorkingDirectory=<%= @app_dir %>
Environment="RAILS_ENV=production"
Environment="DB_POOL=50"
Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1"
Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
ExecStart=<%= @bundle_path %> exec sidekiq -c <%= @sidekiq_threads %> -q default -q mailers -q pull -q push
TimeoutSec=15
Restart=always

View File

@@ -1,7 +1,7 @@
[Unit]
Description=mastodon-web
Requires=redis-server.service
After=redis-server.service
Requires=redis@6379.service
After=redis@6379.service
[Service]
Type=simple
@@ -10,7 +10,7 @@ PIDFile=<%= @app_dir %>/tmp/puma.pid
WorkingDirectory=<%= @app_dir %>
Environment="RAILS_ENV=production"
Environment="PORT=3000"
Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1"
Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
ExecStart=<%= @bundle_path %> exec puma -C config/puma.rb --pidfile <%= @app_dir %>/tmp/puma.pid
ExecStop=<%= @bundle_path %> exec puma -C config/puma.rb --pidfile <%= @app_dir %>/tmp/puma.pid stop
ExecReload=<%= @bundle_path %> exec pumactl -F config/puma.rb --pidfile <%= @app_dir %>/tmp/puma.pid phased-restart