Merge branch 'master' into feature/147-gitea_cookbook

nodes/andromeda.kosmos.org.json

@@ -108,7 +108,8 @@
       "kosmos-base::letsencrypt",
       "git::default",
       "git::package",
-      "build-essential::default"
+      "build-essential::default",
+      "poise-git::default"
     ],
     "platform": "ubuntu",
     "platform_version": "18.04",

site-cookbooks/kosmos-dirsrv/resources/instance.rb

@@ -157,7 +157,7 @@ done
     end
 
     nginx_certbot_site new_resource.hostname do
-      notifies :run, "letsencrypt cert for #{domain}", :delayed
+      notifies :run, "execute[letsencrypt cert for #{domain}]", :delayed
     end
 
     # Generate a Let's Encrypt cert (only if the nginx vhost exists and no cert

site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb

@@ -120,7 +120,8 @@ application app_path do
         "KREDITS_SESSION_SECRET"        => data_bag['kredits_session_secret'],
         "KREDITS_GITHUB_KEY"            => data_bag['kredits_github_key'],
         "KREDITS_GITHUB_SECRET"         => data_bag['kredits_github_secret'],
-        "KREDITS_ZOOM_JWT"              => data_bag['kredits_zoom_jwt']
+        "KREDITS_ZOOM_JWT"               => data_bag['kredits_zoom_jwt'],
+        "KREDITS_ZOOM_MEETING_WHITELIST" => "414901303"
       }
     )
     notifies :run, "execute[systemctl daemon-reload]", :delayed

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

@@ -79,10 +79,10 @@ package %w(imagemagick ffmpeg libxml2-dev libxslt1-dev file git curl pkg-config
            libprotobuf-dev protobuf-compiler libidn11 libidn11-dev libjemalloc1)
 
 npm_package "yarn" do
-  version "1.17.3"
+  version "1.22.4"
 end
 
-ruby_version = "2.6.5"
+ruby_version = "2.6.6"
 
 execute "systemctl daemon-reload" do
   command "systemctl daemon-reload"