From f92b43e0f4d2743ae78edcaaed9dfd42bf1776da Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Mon, 25 May 2020 16:57:09 +0200 Subject: [PATCH 1/3] Configure Zoom meeting whitelist So we only log contributions for actual Kosmos calls --- site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb b/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb index 98da72d..acfb650 100644 --- a/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb +++ b/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 From 5fcb047505efef0dc2c8f1aad2b079986bf9e567 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Mon, 25 May 2020 17:49:22 +0200 Subject: [PATCH 2/3] Update Mastodon system dependencies Needs new Ruby, and why not upgrade Yarn in the process. Running in production. --- nodes/andromeda.kosmos.org.json | 3 ++- site-cookbooks/kosmos-mastodon/recipes/default.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nodes/andromeda.kosmos.org.json b/nodes/andromeda.kosmos.org.json index 08697e1..ace8d73 100644 --- a/nodes/andromeda.kosmos.org.json +++ b/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", diff --git a/site-cookbooks/kosmos-mastodon/recipes/default.rb b/site-cookbooks/kosmos-mastodon/recipes/default.rb index 5e193c4..634a9d0 100644 --- a/site-cookbooks/kosmos-mastodon/recipes/default.rb +++ b/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" From 210c76c4794f5491ddadba17352ebe0b973f5ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Tue, 26 May 2020 14:10:47 +0200 Subject: [PATCH 3/3] Fix the name of the Let's Encrypt cert execute resource The resource in the notification was invalid, missing the type of resource (execute) Fixes #171 --- site-cookbooks/kosmos-dirsrv/resources/instance.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos-dirsrv/resources/instance.rb b/site-cookbooks/kosmos-dirsrv/resources/instance.rb index 89174e5..7faf1cd 100644 --- a/site-cookbooks/kosmos-dirsrv/resources/instance.rb +++ b/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