Browse Source

Upgrade Mastodon to latest version

Using a new branch with freshly added Kosmos changes on top of the
upstream release code.
pull/368/head
raucao 7 months ago
parent
commit
38756fd296
Signed by: raucao
GPG Key ID: 9F88009D31D99C72
  1. 4
      nodes/mastodon-1.json
  2. 2
      site-cookbooks/kosmos-mastodon/attributes/default.rb
  3. 8
      site-cookbooks/kosmos-mastodon/recipes/default.rb

4
nodes/mastodon-1.json

@ -8,7 +8,7 @@
"automatic": {
"fqdn": "mastodon-1",
"os": "linux",
"os_version": "5.4.0-1031-kvm",
"os_version": "5.4.0-1050-kvm",
"hostname": "mastodon-1",
"ipaddress": "192.168.122.197",
"roles": [
@ -18,7 +18,7 @@
"recipes": [
"kosmos-base",
"kosmos-base::default",
"kosmos-postgresql::hostsfile",
"kosmos_postgresql::hostsfile",
"kosmos-mastodon",
"kosmos-mastodon::default",
"kosmos-mastodon::nginx",

2
site-cookbooks/kosmos-mastodon/attributes/default.rb

@ -1,3 +1,5 @@
node.default["kosmos-mastodon"]["repo"] = "https://gitea.kosmos.org/kosmos/mastodon.git"
node.default["kosmos-mastodon"]["revision"] = "kosmos-production"
node.default["kosmos-mastodon"]["directory"] = "/opt/mastodon"
node.default["kosmos-mastodon"]["puma_port"] = 3000
node.default["kosmos-mastodon"]["streaming_port"] = 4000

8
site-cookbooks/kosmos-mastodon/recipes/default.rb

@ -46,7 +46,7 @@ npm_package "yarn" do
version "1.22.4"
end
ruby_version = "2.6.6"
ruby_version = "2.7.2"
execute "systemctl daemon-reload" do
command "systemctl daemon-reload"
@ -106,8 +106,8 @@ application mastodon_path do
git do
user mastodon_user
group mastodon_user
repository "https://gitea.kosmos.org/kosmos/mastodon.git"
revision "production"
repository node["kosmos-mastodon"]["repo"]
revision node["kosmos-mastodon"]["revision"]
# Restart services on deployments
notifies :restart, "application[#{mastodon_path}]", :delayed
end
@ -153,7 +153,7 @@ application mastodon_path do
end
execute 'rake db:migrate' do
environment "RAILS_ENV" => "production", "HOME" => mastodon_path
environment "RAILS_ENV" => "production", "HOME" => mastodon_path#, "SKIP_POST_DEPLOYMENT_MIGRATIONS" => "true"
user mastodon_user
group mastodon_user
cwd mastodon_path

Loading…
Cancel
Save