From ddded6fbaed0b2af69435d27f81aa68a92fbc140 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Tue, 5 Jan 2021 11:30:31 +0100
Subject: [PATCH] Create new nodejs VM, move kredits-github to it

---
 clients/nodejs-2.json                         |  4 ++
 nodes/barnard.kosmos.org.json                 |  1 -
 nodes/{nodejs-1.json => nodejs-2.json}        | 44 +++++++++++++------
 .../kredits-github/attributes/default.rb      |  6 +--
 4 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 clients/nodejs-2.json
 rename nodes/{nodejs-1.json => nodejs-2.json} (55%)

diff --git a/clients/nodejs-2.json b/clients/nodejs-2.json
new file mode 100644
index 0000000..c763933
--- /dev/null
+++ b/clients/nodejs-2.json
@@ -0,0 +1,4 @@
+{
+  "name": "nodejs-2",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWyrBQXathrKzRO7HbX7\nZXqkeGo7X0q3qckO/Uh4Ht67bFb6iQDRo/gRkaVA0PM++2AhtW7wV2NYXR/3qowc\n1gGtO0zuQq56crcL7k9nVuFJ1IbYDyasEq+5nUKzEUVT0hK1/Vzh12gLFhDkBOX+\nCvISLTTQgEGljwNQLf1kZTraJcdDSN0R2k2jl+idJkeAuK5cjMEJa7Fog8scM2rR\nzGhB8gDRp+iq4HQ+yE3R1yXW9rBfWoConnXiNxholt3e2aAte2V1KnEmVLO/8ceo\nvqIp5xEcDKIAIrSqsmopRFXJ0PjS/nbS0Z2ynxpyh1BV4sqr/y4oOryrnwO+LqBB\nHwIDAQAB\n-----END PUBLIC KEY-----\n"
+}
\ No newline at end of file
diff --git a/nodes/barnard.kosmos.org.json b/nodes/barnard.kosmos.org.json
index 4ee09fc..efddfab 100644
--- a/nodes/barnard.kosmos.org.json
+++ b/nodes/barnard.kosmos.org.json
@@ -103,7 +103,6 @@
   },
   "run_list": [
     "role[base]",
-    "role[kredits_github]",
     "recipe[kosmos-ipfs]",
     "recipe[kosmos-hubot::botka_freenode]",
     "recipe[kosmos-hubot::hal8000]",
diff --git a/nodes/nodejs-1.json b/nodes/nodejs-2.json
similarity index 55%
rename from nodes/nodejs-1.json
rename to nodes/nodejs-2.json
index c51a42b..cc7861e 100644
--- a/nodes/nodejs-1.json
+++ b/nodes/nodejs-2.json
@@ -1,22 +1,25 @@
 {
-  "name": "nodejs-1",
+  "name": "nodejs-2",
   "normal": {
     "knife_zero": {
-      "host": "10.1.1.3"
+      "host": "10.1.1.229"
     }
   },
   "automatic": {
-    "fqdn": "nodejs-1",
+    "fqdn": "nodejs-2",
     "os": "linux",
-    "os_version": "5.4.0-1028-kvm",
-    "hostname": "nodejs-1",
-    "ipaddress": "192.168.122.57",
+    "os_version": "5.4.0-1031-kvm",
+    "hostname": "nodejs-2",
+    "ipaddress": "192.168.122.243",
     "roles": [
-
+      "kredits_github"
     ],
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kredits-github",
+      "kredits-github::default",
+      "kredits-github::nginx",
       "apt::default",
       "timezone_iii::default",
       "timezone_iii::debian",
@@ -30,23 +33,38 @@
       "postfix::_common",
       "postfix::_attributes",
       "postfix::sasl_auth",
-      "hostname::default"
+      "hostname::default",
+      "kosmos-nodejs::default",
+      "nodejs::nodejs_from_package",
+      "nodejs::repo",
+      "kosmos-nginx::default",
+      "nginx::default",
+      "nginx::package",
+      "nginx::ohai_plugin",
+      "nginx::repo",
+      "nginx::commons",
+      "nginx::commons_dir",
+      "nginx::commons_script",
+      "nginx::commons_conf",
+      "kosmos-nginx::firewall",
+      "kosmos-base::letsencrypt"
     ],
     "platform": "ubuntu",
     "platform_version": "20.04",
     "cloud": null,
     "chef_packages": {
-      "chef": {
-        "version": "15.14.0",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.14.0/lib"
-      },
       "ohai": {
         "version": "15.12.0",
         "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai"
+      },
+      "chef": {
+        "version": "15.14.0",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.14.0/lib"
       }
     }
   },
   "run_list": [
-    "recipe[kosmos-base]"
+    "recipe[kosmos-base]",
+    "role[kredits_github]"
   ]
 }
\ No newline at end of file
diff --git a/site-cookbooks/kredits-github/attributes/default.rb b/site-cookbooks/kredits-github/attributes/default.rb
index d024a64..686cb01 100644
--- a/site-cookbooks/kredits-github/attributes/default.rb
+++ b/site-cookbooks/kredits-github/attributes/default.rb
@@ -1,3 +1,3 @@
-node.default['kredits-github']['port']          = '3000'
-node.default['kredits-github']['revision']      = 'master'
-node.default['kredits-github']['domain']        = 'kredits-github.kosmos.org'
+node.default['kredits-github']['port']     = '3000'
+node.default['kredits-github']['revision'] = 'master'
+node.default['kredits-github']['domain']   = 'kredits-github.kosmos.org'