From 4335dffe35acdf4a6a7aef2b31f8caa3b45967be Mon Sep 17 00:00:00 2001 From: Jonathan Hurter Date: Wed, 5 Apr 2017 17:28:11 +0200 Subject: [PATCH 1/2] Fix wrong url in scalingo.json --- scalingo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scalingo.json b/scalingo.json index 84b690e245..d60f1529ce 100644 --- a/scalingo.json +++ b/scalingo.json @@ -1,7 +1,7 @@ { "name": "Mastodon", "description": "A GNU Social-compatible microblogging server", - "repository": "https://github.com/johnsudaar/mastodon", + "repository": "https://github.com/tootsuite/mastodon", "logo": "https://github.com/tootsuite/mastodon/raw/master/app/assets/images/logo.png", "env": { "LOCAL_DOMAIN": { From b8218ca4826b8c93f9898386c1ee893fbed316e9 Mon Sep 17 00:00:00 2001 From: Jonathan Hurter Date: Wed, 5 Apr 2017 17:48:55 +0200 Subject: [PATCH 2/2] Make scalingo doc clearer --- docs/Running-Mastodon/Scalingo-guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Running-Mastodon/Scalingo-guide.md b/docs/Running-Mastodon/Scalingo-guide.md index 6552056a82..9329f753e9 100644 --- a/docs/Running-Mastodon/Scalingo-guide.md +++ b/docs/Running-Mastodon/Scalingo-guide.md @@ -8,6 +8,6 @@ Scalingo guide * You can use a .scalingo.io domain, which will be simple to set up, or you can use a custom domain. * You will want Amazon S3 for file storage. The only exception is for development purposes, where you may not care if files are not saved. Follow a guide online for creating a free Amazon S3 bucket and Access Key, then enter the details. * If you want your Mastodon to be able to send emails, configure SMTP settings here (or later). Consider using [Mailgun](https://mailgun.com) or similar, who offer free plans that should suit your interests. -3. Deploy! The app should be set up, with a working web interface and database. You can change settings and manage versions from the Heroku dashboard. +3. Deploy! The app should be set up, with a working web interface and database. You can change settings and manage versions from the Scalingo dashboard. -You may need to use the `scalingo` CLI application to run `USERNAME=yourUsername rails mastodon:make_admin` to make yourself an admin. +To make yourself an admin, you can use the `scalingo` CLI: `scalingo run -e USERNAME=yourusername rails mastodon:make_admin`.