Merge branch 'master' into bugfix/nodejs_update_mastodon_fixes

2019-03-14 09:36:10 +01:00
parent 2bd8bf14e6 e20ad9e6f9
commit 7b6e04ae49
31 changed files with 480 additions and 192 deletions
--- a/site-cookbooks/kosmos-mastodon/recipes/default.rb
+++ b/site-cookbooks/kosmos-mastodon/recipes/default.rb
@@ -48,7 +48,7 @@ npm_package "yarn" do
  version "1.6.0"
 end

-ruby_version = "2.5.3"
+ruby_version = "2.6.0"

 execute "systemctl daemon-reload" do
  command "systemctl daemon-reload"
@@ -108,8 +108,8 @@ application mastodon_path do
  git do
    user "mastodon"
    group "mastodon"
-    repository "https://github.com/67P/mastodon.git"
-    revision   "kosmos"
+    repository "https://gitea.kosmos.org/kosmos/mastodon.git"
+    revision   "production"
  end

  mastodon_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mastodon')