Merge branch 'master' into patch-3

This commit is contained in:
Ornithologist Coder 2017-05-07 18:19:52 +02:00 committed by GitHub
commit 4cc2dba359
2 changed files with 34 additions and 27 deletions

View file

@ -109,7 +109,7 @@ server {
## Running in production without Docker
It is recommended to create a special user for mastodon on the server (you could call the user `mastodon`), though remember to disable outside login for it. You should only be able to get into that user through `sudo su - mastodon`.
It is recommended to create a special user for mastodon on the server (you could call the user `mastodon`), though remember to disable outside login for it. You should only be able to get into that user through `sudo -u mastodon`.
## General dependencies
@ -165,8 +165,7 @@ Initial Setup postgres:
Set up a user and database for Mastodon:
sudo su - postgres
psql
sudo -u postgres psql
In the prompt:
@ -200,7 +199,11 @@ Then once `rbenv` is ready, run `rbenv install 2.4.1` to install the Ruby versio
## Git
You need the `git-core` package installed on your system. If it is so, from the `mastodon` user:
You need the `git-core` package installed on your system. If it is so, run the shell from the `mastodon` user:
sudo -su mastodon
And enter the following commands:
cd ~
git clone https://github.com/tootsuite/mastodon.git live

View file

@ -40,7 +40,7 @@ ___
## Available libraries
| Language | Library | Developer(s) |
| -------------------- | --------------------------------------------------------------- | ------------------------------------------------------------------------------ |
| -------------------- | ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------ |
| Apex (Salesforce) | [apex-mastodon](https://github.com/tzmfreedom/apex-mastodon) | |
| C# (.NET Standard) | [Mastodot](https://github.com/yamachu/Mastodot) | |
| C# (.NET Standard) | [Mastonet](https://github.com/glacasa/Mastonet) | |
@ -56,6 +56,10 @@ ___
| Javascript (Browser) | [mastodon.js](https://github.com/Kirschn/mastodon.js) | |
| JavaScript (Node.js) | [node-mastodon](https://github.com/jessicahayley/node-mastodon) | |
| Perl | [Mastodon::Client](https://metacpan.org/pod/Mastodon::Client) | |
| PHP | [Mastodon-api-php](https://github.com/yks118/Mastodon-api-php) | |
| PHP | [MastodonOAuthPHP](https://github.com/TheCodingCompany/MastodonOAuthPHP) | |
| PHP | [Phediverse Mastodon REST Client](https://github.com/phediverse/mastodon-rest) | |
| PHP | [TootoPHP](https://framagit.org/MaxKoder/TootoPHP) | |
| Python | [Mastodon.py](https://github.com/halcy/Mastodon.py) | |
| R | [mastodon](https://github.com/ThomasChln/mastodon) | |
| Ruby | [mastodon-api](https://github.com/tootsuite/mastodon-api) | [@Gargron@mastodon.social](https://mastodon.social/@Gargron) |