From 4b0818177daefbfec113007a985dfc7a295aa3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Tue, 7 May 2019 14:35:53 +0200 Subject: [PATCH 1/4] Use an unreleased version of our ipfs cookbook to lower RAM usage --- Berksfile | 2 +- Berksfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Berksfile b/Berksfile index 190ad23..57bd762 100644 --- a/Berksfile +++ b/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' diff --git a/Berksfile.lock b/Berksfile.lock index 7200bd8..f3b43e5 100644 --- a/Berksfile.lock +++ b/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: 76d60b87dda0b4fb1693fc1693e88d4582a584b2 + ref: feature logrotate (= 2.2.0) mariadb (= 0.3.1) mediawiki From 14f0fbc7bef72ec79ea4fc8c83badd621a8a17b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Tue, 7 May 2019 14:41:57 +0200 Subject: [PATCH 2/4] Use the last commit of the ipfs PR --- Berksfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Berksfile.lock b/Berksfile.lock index f3b43e5..1d1458f 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -19,7 +19,7 @@ DEPENDENCIES hostsfile (= 2.4.5) ipfs git: https://github.com/67P/ipfs-cookbook.git - revision: 76d60b87dda0b4fb1693fc1693e88d4582a584b2 + revision: 5303612854159bd1e37690d6408a1d8a3f2597a3 ref: feature logrotate (= 2.2.0) mariadb (= 0.3.1) From 36e8950eba25b0aa6c52c9632540e1c6dc373eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Tue, 7 May 2019 14:56:40 +0200 Subject: [PATCH 3/4] Update ipfs again, to fix a bug in the ipfs_config resource It could not handle integers --- Berksfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Berksfile.lock b/Berksfile.lock index 1d1458f..da37d29 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -19,7 +19,7 @@ DEPENDENCIES hostsfile (= 2.4.5) ipfs git: https://github.com/67P/ipfs-cookbook.git - revision: 5303612854159bd1e37690d6408a1d8a3f2597a3 + revision: 5aa50ecc7eca5c7f113492057ca3bc8158e5154c ref: feature logrotate (= 2.2.0) mariadb (= 0.3.1) From c4d5a2c6bbbcbd53acead785157456947a8d3908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Tue, 7 May 2019 14:57:47 +0200 Subject: [PATCH 4/4] Remove the ipfs cluster recipe from dev's run list --- nodes/dev.kosmos.org.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nodes/dev.kosmos.org.json b/nodes/dev.kosmos.org.json index 5d6bac0..041142f 100644 --- a/nodes/dev.kosmos.org.json +++ b/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": {