瀏覽代碼

Merge remote-tracking branch 'origin/master'

Wxcafé (Clément Hertling) 7 年之前
父節點
當前提交
602ba587f9
共有 2 個文件被更改,包括 7 次插入5 次删除
  1. 6 5
      Running-Mastodon/Resources-needed.md
  2. 1 0
      Using-the-API/API.md

+ 6 - 5
Running-Mastodon/Resources-needed.md

@@ -3,11 +3,12 @@ Here are some information about what you'll need for running your instance, both
 
 ### With Docker :
 
-| CPU % / info | RAM use / total | Median traffic in | out | Users | OS | Sidekiq threads | Hosting provider | URL |
-|-----|-----|-----------------------|-----|-------|----|-----------------|------------------|-----|
+| CPU % / info | RAM use / total | Median traffic in | out | Users | OS | Sidekiq threads | puma params | Hosting provider | URL |
+|-----|-----|-----------------------|-----|-------|----|-----------------|----------------|------------------|-----|
 
 ### Without Docker :
 
-| CPU % / info | RAM  use / total | Median traffic in | out | Users | OS | Sidekiq threads | Hosting provider | URL |
-|-----|-----|-----------------------|-----|-------|----|-----------------|------------------|-----|
-| 17.3% / 2x2.4Ghz | 1.8 GB / 4 GB | 260kbps | 858kbps | 785 | Debian | 30 | [vultr](https://Vultr.com) | [social.wxcafe.net](https://social.wxcafe.net) |
+| CPU % / info | RAM  use / total | Median traffic in | out | Users | OS | Sidekiq params | puma params | Server model / Provider | URL |
+|-----|-----|-----------------------|-----|-------|----|-----------------|----------------|------------------|-----|
+| 17.3% / 2x2.4Ghz | 1.8 GB / 4 GB | 260kbps | 858kbps | 785 | Debian | 30 threads | ? | [vultr](https://Vultr.com) | [social.wxcafe.net](https://social.wxcafe.net) |
+| 30% / 4x3.40GHz | 1.8 to 2.2GB / 4GB | 90MB/s | 900MB/s | 1800 | Debian | 5 threads, DB_POOL=10 | MAX_THREADS=5, WEB_CONCURRENCY=4 | [Dedibox LT 2014v2](https://documentation.online.net/fr/dedicated-server/offers/limited/server-dedibox-limited-edition-13816) | [oc.todon.fr](oc.todon.fr) |

+ 1 - 0
Using-the-API/API.md

@@ -48,6 +48,7 @@ ___
 - [For Rust](https://github.com/Aaronepower/mammut)
 - [For Perl](https://metacpan.org/pod/Mastodon::Client)
 - [For Swift](https://github.com/ornithocoder/MastodonKit)
+- [For Go](https://github.com/mattn/go-mastodon)
 
 ___