Merge branch 'master' into feature/maintenance_page
This commit is contained in:
commit
016f75f89b
@ -55,4 +55,4 @@ cookbook 'homebrew', '= 3.0.0'
|
|||||||
cookbook 'mariadb', '= 0.3.1'
|
cookbook 'mariadb', '= 0.3.1'
|
||||||
cookbook 'ipfs',
|
cookbook 'ipfs',
|
||||||
git: 'https://github.com/67P/ipfs-cookbook.git',
|
git: 'https://github.com/67P/ipfs-cookbook.git',
|
||||||
ref: 'v0.1.3'
|
ref: 'feature/reduce_memory_usage'
|
||||||
|
@ -19,8 +19,8 @@ DEPENDENCIES
|
|||||||
hostsfile (= 2.4.5)
|
hostsfile (= 2.4.5)
|
||||||
ipfs
|
ipfs
|
||||||
git: https://github.com/67P/ipfs-cookbook.git
|
git: https://github.com/67P/ipfs-cookbook.git
|
||||||
revision: c6853c4d09fe9ff1f15b69b57116ba5f8d0ed939
|
revision: 5aa50ecc7eca5c7f113492057ca3bc8158e5154c
|
||||||
ref: v0.1.3
|
ref: feature
|
||||||
logrotate (= 2.2.0)
|
logrotate (= 2.2.0)
|
||||||
mariadb (= 0.3.1)
|
mariadb (= 0.3.1)
|
||||||
mediawiki
|
mediawiki
|
||||||
|
@ -7,8 +7,7 @@
|
|||||||
"5apps-hubot::xmpp_botka",
|
"5apps-hubot::xmpp_botka",
|
||||||
"kosmos-mastodon",
|
"kosmos-mastodon",
|
||||||
"kosmos-mastodon::nginx",
|
"kosmos-mastodon::nginx",
|
||||||
"sockethub::_firewall",
|
"sockethub::_firewall"
|
||||||
"kosmos-ipfs::cluster"
|
|
||||||
],
|
],
|
||||||
"normal": {
|
"normal": {
|
||||||
"postgresql": {
|
"postgresql": {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user