Merge branch 'master' into feature/maintenance_page

Berksfile

@@ -55,4 +55,4 @@ cookbook 'homebrew',               '= 3.0.0'
 cookbook 'mariadb',                '= 0.3.1'
 cookbook 'ipfs',
          git: 'https://github.com/67P/ipfs-cookbook.git',
-         ref: 'v0.1.3'
+         ref: 'feature/reduce_memory_usage'

Berksfile.lock

@@ -19,8 +19,8 @@ DEPENDENCIES
   hostsfile (= 2.4.5)
   ipfs
     git: https://github.com/67P/ipfs-cookbook.git
-    revision: c6853c4d09fe9ff1f15b69b57116ba5f8d0ed939
-    ref: v0.1.3
+    revision: 5aa50ecc7eca5c7f113492057ca3bc8158e5154c
+    ref: feature
   logrotate (= 2.2.0)
   mariadb (= 0.3.1)
   mediawiki

nodes/dev.kosmos.org.json

@@ -7,8 +7,7 @@
     "5apps-hubot::xmpp_botka",
     "kosmos-mastodon",
     "kosmos-mastodon::nginx",
-    "sockethub::_firewall",
-    "kosmos-ipfs::cluster"
+    "sockethub::_firewall"
   ],
   "normal": {
     "postgresql": {