From fe63f01f7be50d270c213042b5d9b30395aa25d3 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Tue, 5 Jan 2021 18:03:15 +0100
Subject: [PATCH] Move wormhole from barnard to nodejs-2

Fixed two small bugs in the recipe:

* hubot user wasn't created when necessary
* systemd template always included redis service dependency
---
 nodes/barnard.kosmos.org.json                                  | 1 -
 nodes/nodejs-2.json                                            | 3 ++-
 site-cookbooks/kosmos-hubot/recipes/wormhole.rb                | 3 +++
 .../kosmos-hubot/templates/default/nodejs.systemd.service.erb  | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nodes/barnard.kosmos.org.json b/nodes/barnard.kosmos.org.json
index efddfab..fea3485 100644
--- a/nodes/barnard.kosmos.org.json
+++ b/nodes/barnard.kosmos.org.json
@@ -107,7 +107,6 @@
     "recipe[kosmos-hubot::botka_freenode]",
     "recipe[kosmos-hubot::hal8000]",
     "recipe[kosmos-hubot::hal8000_xmpp]",
-    "recipe[kosmos-hubot::wormhole]",
     "recipe[sockethub]",
     "recipe[sockethub::proxy]",
     "recipe[kosmos-dirsrv]"
diff --git a/nodes/nodejs-2.json b/nodes/nodejs-2.json
index cc7861e..b5c676c 100644
--- a/nodes/nodejs-2.json
+++ b/nodes/nodejs-2.json
@@ -65,6 +65,7 @@
   },
   "run_list": [
     "recipe[kosmos-base]",
+    "recipe[kosmos-hubot::wormhole]",
     "role[kredits_github]"
   ]
-}
\ No newline at end of file
+}
diff --git a/site-cookbooks/kosmos-hubot/recipes/wormhole.rb b/site-cookbooks/kosmos-hubot/recipes/wormhole.rb
index 40063a9..c10d64d 100644
--- a/site-cookbooks/kosmos-hubot/recipes/wormhole.rb
+++ b/site-cookbooks/kosmos-hubot/recipes/wormhole.rb
@@ -32,6 +32,7 @@ build_essential app_name do
 end
 
 include_recipe "kosmos-nodejs"
+include_recipe "kosmos-hubot::_user"
 
 application app_path do
   data_bag = Chef::EncryptedDataBagItem.load('credentials', app_name)
@@ -62,6 +63,7 @@ application app_path do
     action :nothing
   end
 
+  # TODO use chef systemd_service resource
   template "/lib/systemd/system/#{app_name}.service" do
     source 'nodejs.systemd.service.erb'
     owner 'root'
@@ -70,6 +72,7 @@ application app_path do
     variables(
       user: app_user,
       group: app_group,
+      without_redis: true,
       app_dir: app_path,
       entry: "#{app_path}/bin/hubot -a irc --name #{app_name}",
       environment: {
diff --git a/site-cookbooks/kosmos-hubot/templates/default/nodejs.systemd.service.erb b/site-cookbooks/kosmos-hubot/templates/default/nodejs.systemd.service.erb
index 8dc98a9..8e27347 100644
--- a/site-cookbooks/kosmos-hubot/templates/default/nodejs.systemd.service.erb
+++ b/site-cookbooks/kosmos-hubot/templates/default/nodejs.systemd.service.erb
@@ -1,7 +1,9 @@
 [Unit]
 Description=Start nodejs app
+<% unless @without_redis %>
 Requires=redis-server.service
 After=redis-server.service
+<% end %>
 
 [Service]
 ExecStart=<%= @entry %>