diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Extensions.md | 6 | ||||
| -rw-r--r-- | docs/Running-Mastodon/Administration-guide.md | 13 | ||||
| -rw-r--r-- | docs/Running-Mastodon/Heroku-guide.md | 4 | ||||
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 3 |
4 files changed, 15 insertions, 11 deletions
diff --git a/docs/Extensions.md b/docs/Extensions.md index 6a940eebc..cf79379eb 100644 --- a/docs/Extensions.md +++ b/docs/Extensions.md @@ -48,9 +48,3 @@ Mastodon uses the following Salmon slaps to signal a follow request, a follow re - `http://activitystrea.ms/schema/1.0/reject` The activity object of the request-friend slap is the account in question. The activity object of the authorize and reject slaps is the original request-friend activity. Request-friend slap is sent to the locked account, when the end-user of that account decides, the authorize/reject decision slap is sent back to the requester. - -#### PuSH amendment - -Mastodon will only deliver PuSH payloads to callback URLs the domain of which matches at least one follower of the account in question. That means anonymous manual/subscriptions are not possible. - -Private statuses do not appear on Atom feeds, but do get delivered in PuSH payloads to the domains of approved followers. diff --git a/docs/Running-Mastodon/Administration-guide.md b/docs/Running-Mastodon/Administration-guide.md index 1b9dc8630..af78f6235 100644 --- a/docs/Running-Mastodon/Administration-guide.md +++ b/docs/Running-Mastodon/Administration-guide.md @@ -1,8 +1,16 @@ Administration guide -================= +==================== So, you have a working Mastodon instance... now what? +## Turning into an admin + +The following rake task: + + rails mastodon:make_admin USERNAME=alice + +Would turn the local user "alice" into an admin. + ## Administration web interface A user that is designated as `admin = TRUE` in the database is able to access a suite of administration tools: @@ -20,9 +28,10 @@ Your site settings are stored in the `settings` database table, and editable thr You are able to set the following settings: +- Site title - Contact username - Contact email - Site description - Site extended description -You may wish to use the extended description (shown at https://yourmastodon.instance/about/more ) to display content guidelines or a user agreement (see https://mastodon.social/about/more for an example). \ No newline at end of file +You may wish to use the extended description (shown at https://yourmastodon.instance/about/more ) to display content guidelines or a user agreement (see https://mastodon.social/about/more for an example). diff --git a/docs/Running-Mastodon/Heroku-guide.md b/docs/Running-Mastodon/Heroku-guide.md index 6aa8be774..799b8a64c 100644 --- a/docs/Running-Mastodon/Heroku-guide.md +++ b/docs/Running-Mastodon/Heroku-guide.md @@ -1,7 +1,7 @@ Heroku guide ============ -[](https://heroku.com/deploy) +[](https://dashboard.heroku.com/new?button-url=https://github.com/tootsuite/mastodon&template=https://github.com/tootsuite/mastodon) Mastodon can theoretically run indefinitely on a free [Heroku](https://heroku.com) app. It should be noted this has limited testing and could have unpredictable results. @@ -10,4 +10,4 @@ Mastodon can theoretically run indefinitely on a free [Heroku](https://heroku.co * You can use a .herokuapp.com domain, which will be simple to set up, or you can use a custom domain. If you want a custom domain and HTTPS, you will need to upgrade to a paid plan (to use Heroku's SSL features), or set up [CloudFlare](https://cloudflare.com) who offer free "Flexible SSL" (note: CloudFlare have some undefined limits on WebSockets. So far, no one has reported hitting concurrent connection limits). * You will want Amazon S3 for file storage. The only exception is for development purposes, where you may not care if files are not saaved. 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. \ No newline at end of file +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. diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index b79620fc6..ed3c74294 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -12,6 +12,7 @@ List of Known Mastodon instances | [on.vu](https://on.vu) | Appears defunct|No| | [gay.crime.team](https://gay.crime.team) |N/A|Yes(?)| | [gnusocial.me](https://gnusocial.me) |Yes, it's a mastodon instance now|Yes| - +| [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes| +| [memetastic.space](https://memetastic.space) |Memes|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). |