From 8b5966b37bacc844b7217617fea1d1e493af2d4f Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Mon, 3 Apr 2017 00:08:40 +0200 Subject: [PATCH 1/3] Fix install instructions. Closes GH-745. --- Running-Mastodon/Production-guide.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Running-Mastodon/Production-guide.md b/Running-Mastodon/Production-guide.md index a6c776f0..7af92fd9 100644 --- a/Running-Mastodon/Production-guide.md +++ b/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-*.service` to get things going. ## Cronjobs From 973a74d25213da13c4af94b6ae2862582cf9da2a Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Mon, 3 Apr 2017 00:10:51 +0200 Subject: [PATCH 2/3] Also fix the start command. --- Running-Mastodon/Production-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Running-Mastodon/Production-guide.md b/Running-Mastodon/Production-guide.md index 7af92fd9..f0dd7bd2 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -209,7 +209,7 @@ Restart=always WantedBy=multi-user.target ``` -This allows you to `sudo systemctl enable /etc/systemd/system/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 From caf5b4df1a441d4968e894b90748fd8c873aa7f9 Mon Sep 17 00:00:00 2001 From: shel Date: Sun, 2 Apr 2017 20:11:28 -0400 Subject: [PATCH 3/3] Add social.imirhil.fr --- Using-Mastodon/List-of-Mastodon-instances.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 2f307b8a..7c8a3389 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/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).