diff options
| author | Kibigo! <marrus-sh@users.noreply.github.com> | 2017-04-02 21:07:07 -0700 |
|---|---|---|
| committer | Kibigo! <marrus-sh@users.noreply.github.com> | 2017-04-02 21:07:07 -0700 |
| commit | 565568dd9c5bc82c7de40fe021e8705b95aeb32d (patch) | |
| tree | 0278c53e8630fe7c262375bce023ed5948c3bc7a /docs | |
| parent | 6e41ef55ed629953427accab3b3166883953125c (diff) | |
| parent | 1a5ab538de2ea0c8e6f8faf357c17a90a41897e5 (diff) | |
Merging 'upstream' updates
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Running-Mastodon/Production-guide.md | 3 | ||||
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/Running-Mastodon/Production-guide.md b/docs/Running-Mastodon/Production-guide.md index a6c776f09..f0dd7bd2b 100644 --- a/docs/Running-Mastodon/Production-guide.md +++ b/docs/Running-Mastodon/Production-guide.md @@ -95,7 +95,6 @@ Setup a user and database for Mastodon: In the prompt: CREATE USER mastodon CREATEDB; - CREATE DATABASE mastodon_production OWNER mastodon; \q ## Rbenv @@ -210,7 +209,7 @@ Restart=always WantedBy=multi-user.target ``` -This allows you to `sudo systemctl enable mastodon-*.service` and `sudo systemctl start mastodon-*.service` to get things going. +This allows you to `sudo systemctl enable /etc/systemd/system/mastodon-*.service` and `sudo systemctl start mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service` to get things going. ## Cronjobs diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index 2f307b8a0..7c8a33893 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -20,5 +20,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.targaryen.house](https://social.targaryen.house) |N/A|Yes|No| | [social.mashek.net](https://social.mashek.net) |Themed and customised for Mashekstein Labs community. Selectively federates.|Yes|No| | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes| +| [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). |