Merge branch 'master' into feature/7-ejabberd_rebased_2

nodes/andromeda.kosmos.org.json

@@ -8,7 +8,8 @@
     "kosmos-mediawiki",
     "sockethub",
     "sockethub::proxy",
-    "kosmos-btcpayserver::proxy"
+    "kosmos-btcpayserver::proxy",
+    "role[mastodon]"
   ],
   "normal": {
     "postgresql": {

nodes/barnard.kosmos.org.json

@@ -0,0 +1,13 @@
+{
+  "run_list": [
+    "role[base]",
+    "role[kredits_github]",
+    "kosmos-ipfs::cluster",
+    "kosmos-hubot::botka_freenode",
+    "kosmos-hubot::hal8000",
+    "kosmos-hubot::hal8000_xmpp"
+  ],
+  "automatic": {
+    "ipaddress": "barnard.kosmos.org"
+  }
+}

nodes/dev.kosmos.org.json

@@ -2,14 +2,8 @@
   "run_list": [
     "role[base]",
     "kosmos-redis",
-    "kosmos-hubot",
     "5apps-xmpp_server",
-    "5apps-hubot::xmpp_schlupp",
-    "5apps-hubot::xmpp_botka",
-    "kosmos-mastodon",
-    "kosmos-mastodon::nginx",
-    "sockethub::_firewall",
-    "kosmos-ipfs::cluster"
+    "sockethub::_firewall"
   ],
   "normal": {
     "postgresql": {