From 90aebe54de90a20c041e2a46d734b9dd8719171a Mon Sep 17 00:00:00 2001
From: Garret Alfert <alfert@wevelop.de>
Date: Fri, 15 Nov 2019 14:37:19 +0100
Subject: [PATCH 1/4] Revert "Remove tweet reading from IRC Hubot"

This reverts commit d5fc7ad105f45ea2b8eb2033564e4474abfc77a9.
---
 site-cookbooks/kosmos-hubot/recipes/hal8000.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb
index b40423f..87e92c6 100644
--- a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb
+++ b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb
@@ -60,6 +60,7 @@ application hal8000_path do
     group "hubot"
     content [
       "hubot-help",
+      "hubot-read-tweet",
       "hubot-redis-brain",
       "hubot-rules",
       "hubot-shipit",

From bd3ef8b6353f12eb07299bf9f4e38bf7d6487a97 Mon Sep 17 00:00:00 2001
From: Garret Alfert <alfert@wevelop.de>
Date: Fri, 15 Nov 2019 14:43:56 +0100
Subject: [PATCH 2/4] Remove tweet reading from XMPP Hubot

Because of the wormhole feature between XMPP and IRC, any links to
tweets will be read by the hal8000 bots on both platforms.

This change removes the Tweet reading extension from the XMPP version of
the bot.
---
 site-cookbooks/kosmos-hubot/attributes/default.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site-cookbooks/kosmos-hubot/attributes/default.rb b/site-cookbooks/kosmos-hubot/attributes/default.rb
index 9fbaeeb..0acddb3 100644
--- a/site-cookbooks/kosmos-hubot/attributes/default.rb
+++ b/site-cookbooks/kosmos-hubot/attributes/default.rb
@@ -7,7 +7,7 @@ node.default['hal8000_xmpp']['http_port'] = 8082
 node.default['hal8000_xmpp']['domain'] = "hal8000.chat.kosmos.org"
 
 node.default['hal8000_xmpp']['hubot_scripts'] = [
-  "hubot-help", "hubot-read-tweet", "hubot-redis-brain",
+  "hubot-help", "hubot-redis-brain",
   "hubot-rules", "hubot-shipit", "hubot-plusplus",
   "hubot-tell", "hubot-seen", "hubot-rss-reader",
   "hubot-incoming-webhook", "hubot-auth",

From db4e2777d413e82c945f7832b00f63c33f25bc17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Fri, 22 Nov 2019 14:37:29 +0100
Subject: [PATCH 3/4] Fix a bug preventing nginx from being reloaded after
 generating a cert

Change the notifies property to :immediately in nginx_certbot_site. This
way the vhost template is recreated and then triggers a reload of the
nginx service. The previous code resulted in nginx not being reloaded,
as the action had already been queued earlier.
---
 site-cookbooks/kosmos-nginx/metadata.rb                     | 2 +-
 site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/site-cookbooks/kosmos-nginx/metadata.rb b/site-cookbooks/kosmos-nginx/metadata.rb
index de338cd..38d6140 100644
--- a/site-cookbooks/kosmos-nginx/metadata.rb
+++ b/site-cookbooks/kosmos-nginx/metadata.rb
@@ -4,7 +4,7 @@ maintainer_email 'mail@kosmos.org'
 license          'MIT'
 description      'Installs/Configures kosmos-nginx'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.3.1'
+version          '0.3.2'
 
 depends 'nginx'
 depends 'firewall'
diff --git a/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb b/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb
index de17158..97a13af 100644
--- a/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb
+++ b/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb
@@ -47,6 +47,6 @@ action :create do
       ::File.exist?("#{node['nginx']['dir']}/sites-enabled/#{domain}_certbot") &&
         !::File.exist?("/etc/letsencrypt/live/#{domain}/fullchain.pem")
     end
-    notifies :create, "template[#{node['nginx']['dir']}/sites-available/#{site}]", :delayed
+    notifies :create, "template[#{node['nginx']['dir']}/sites-available/#{site}]", :immediately
   end
 end

From 678286d758f6758bbf943b892ba997ef5819e35e Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Tue, 26 Nov 2019 22:04:49 +0100
Subject: [PATCH 4/4] Enable wiki editor toolbar

Enables the formatting toolbar for the wiki editor.
---
 site-cookbooks/kosmos-mediawiki/recipes/default.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
index e07f7a5..261da2e 100644
--- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb
+++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
@@ -196,6 +196,8 @@ $wgArticlePath = "/$1";
 
     file.insert_line_if_no_match(/Mermaid/,
                                  "wfLoadExtension( 'Mermaid' );")
+    file.insert_line_if_no_match(/WikiEditor/,
+                                 "wfLoadExtension( 'WikiEditor' );")
 
     file.write_file
   end