zelo72
/
documentation
mirror of https://github.com/mastodon/documentation
1
0
Fork 0
Code Issues 6 Releases Wiki Activity

Merging 'upstream' updates

This commit is contained in:
Kibigo! 2017-04-02 21:07:07 -07:00
parent 81c56f111a ca343d2583
commit e22dea2812
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Running-Mastodon/Production-guide.md
View File

@ -95,7 +95,6 @@ Setup a user and database for Mastodon:
In the prompt: In the prompt:
CREATE USER mastodon CREATEDB; CREATE USER mastodon CREATEDB;
CREATE DATABASE mastodon_production OWNER mastodon;
\q \q
## Rbenv ## Rbenv
@ -210,7 +209,7 @@ Restart=always
WantedBy=multi-user.target 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 ## Cronjobs

1
Using-Mastodon/List-of-Mastodon-instances.md
View File

@ -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.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| | [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| | [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). Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).