From 5714143e530363b8fc0f2e68743ea329f2a5005f Mon Sep 17 00:00:00 2001 From: Angristan Date: Tue, 4 Apr 2017 15:57:37 +0200 Subject: [PATCH 01/60] Missing quotes --- 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 469fefa9..1fba2025 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -132,7 +132,7 @@ Fill in the important data, like host/port of the redis database, host/port/user rake secret -To get a random string. If you are setting up on one single server (most likely), then REDIS_HOST is localhost and `DB_HOST` is `/var/run/postgresql`, `DB_USER` is `mastodon` and `DB_NAME` is `mastodon_production` while `DB_PASS` is empty because this setup will use the ident authentication method (system user "mastodon" maps to postgres user "mastodon"). +To get a random string. If you are setting up on one single server (most likely), then `REDIS_HOST` is localhost and `DB_HOST` is `/var/run/postgresql`, `DB_USER` is `mastodon` and `DB_NAME` is `mastodon_production` while `DB_PASS` is empty because this setup will use the ident authentication method (system user "mastodon" maps to postgres user "mastodon"). ## Setup From 9d7588c29a171fe8a67f9c77c5e819609d8c154f Mon Sep 17 00:00:00 2001 From: Florian Maunier Date: Tue, 4 Apr 2017 16:03:05 +0200 Subject: [PATCH 02/60] Update List-of-Mastodon-instances.md Add my own instance --- 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 677ec7e5..5f8ef791 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -37,5 +37,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No| | [manowar.social](https://manowar.social)|N/A|No|No| | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No| +| [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|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). From e3327c69f1fa5593ccab2e86227c6a2c19dafeeb Mon Sep 17 00:00:00 2001 From: Adam Thurlow Date: Tue, 4 Apr 2017 11:14:51 -0300 Subject: [PATCH 03/60] Add mastodon.club to running instances list --- Using-Mastodon/List-of-Mastodon-instances.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 677ec7e5..380ff63c 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -24,6 +24,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes| | [social.wxcafe.net](https://social.wxcafe.net) |Open registrations, federates everywhere, no moderation yet|Yes|Yes| | [octodon.social](https://octodon.social) |Open registrations, federates everywhere, cutest instance yet|Yes|Yes| +| [mastodon.club](https://mastodon.club)|Open Registration, Open Federation, Mostly Canadians|Yes|No| | [hostux.social](https://hostux.social) |N/A|Yes|Yes| | [social.alex73630.xyz](https://social.alex73630.xyz) |Francophones|Yes|Yes| | [maly.io](https://maly.io) |N/A|Yes|No| @@ -38,4 +39,5 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [manowar.social](https://manowar.social)|N/A|No|No| | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No| + Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 36cd3cc4dd4bb007e976fa399a11d044fa02ab55 Mon Sep 17 00:00:00 2001 From: Jo Decker Date: Tue, 4 Apr 2017 15:29:07 +0100 Subject: [PATCH 04/60] Update social.diskseven.com's IPv6 status As far as I'm aware, my instance should be supporting IPv6 now. Was an error on my part that it wasn't working before. --- Using-Mastodon/List-of-Mastodon-instances.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 677ec7e5..587e9d86 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -15,7 +15,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [gay.crime.team](https://gay.crime.team) |the place for doin' gay crime online (please don't actually do crime here)|Yes|No| | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes|No| | [memetastic.space](https://memetastic.space) |Memes|Yes|No| -| [social.diskseven.com](https://social.diskseven.com) |Single user|No|No (DNS entry but no response)| +| [social.diskseven.com](https://social.diskseven.com) |Single user|No|Yes| | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No| | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| | [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes| From c4afe950bbd61df519c7aa50cca796d813dc0613 Mon Sep 17 00:00:00 2001 From: Angristan Date: Tue, 4 Apr 2017 17:23:56 +0200 Subject: [PATCH 05/60] Fix crontab edit Missing -u parameter to specify the mastodon user. --- 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 469fefa9..2c8db20b 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -221,7 +221,7 @@ I recommend creating a couple cronjobs for the following tasks: You may want to run `which bundle` first and copypaste that full path instead of simply `bundle` in the above commands because cronjobs usually don't have all the paths set. The time and intervals of when to run these jobs are up to you, but once every day should be enough for all. -You can edit the cronjob file for the `mastodon` user by running `sudo crontab -e mastodon` (outside of the mastodon user). +You can edit the cronjob file for the `mastodon` user by running `sudo crontab -e -u mastodon` (outside of the mastodon user). ## Things to look out for when upgrading Mastodon From 942d5663a6e65275562a7632b8a80378f9aa1109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Santoro?= Date: Tue, 4 Apr 2017 18:11:14 +0200 Subject: [PATCH 06/60] Add social.nasqueron.org instance --- 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 677ec7e5..d971147b 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -37,5 +37,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No| | [manowar.social](https://manowar.social)|N/A|No|No| | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No| +| [social.nasqueron.org](https://social.nasqueron.org) |Dreamers, open source developers, free culture|Yes|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). From cfb9551aca247fcbf4b023f9623308c976c5f4e2 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 4 Apr 2017 18:11:41 +0200 Subject: [PATCH 07/60] Add oc.todon.fr to the list of instances. [SKIP CI] --- 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 677ec7e5..39f51cff 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -26,6 +26,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [octodon.social](https://octodon.social) |Open registrations, federates everywhere, cutest instance yet|Yes|Yes| | [hostux.social](https://hostux.social) |N/A|Yes|Yes| | [social.alex73630.xyz](https://social.alex73630.xyz) |Francophones|Yes|Yes| +| [oc.todon.fr](https://oc.todon.fr) |Modérée et principalement francophone, pas de tolérances pour misogynie/LGBTphobies/validisme/etc.|Yes|Yes| | [maly.io](https://maly.io) |N/A|Yes|No| | [social.lou.lt](https://social.lou.lt) |N/A|Yes|No| | [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |N/A|Yes|No| From b777d54db26e2d375c5ab41a811204c2dd671abd Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Tue, 4 Apr 2017 17:28:29 +0100 Subject: [PATCH 08/60] Update the list of instances --- Using-Mastodon/List-of-Mastodon-instances.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 677ec7e5..b0c9c58f 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -7,19 +7,17 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | -------------|-------------|---|---| | [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes|No| | [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|No| -| [social.tchncs.de](https://social.tchncs.de)|N/A|Yes|No| | [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|No| | [socially.constructed.space](https://socially.constructed.space) |Single user|No|No| | [epiktistes.com](https://epiktistes.com) |N/A|Yes|No| | [fern.surgeplay.com](https://fern.surgeplay.com) |Federates everywhere, Minecraft-focused|Yes|No -| [gay.crime.team](https://gay.crime.team) |the place for doin' gay crime online (please don't actually do crime here)|Yes|No| +| [gay.crime.team](https://gay.crime.team) |the place for doin' gay crime online (please don't actually do crime here)|No|No| | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes|No| | [memetastic.space](https://memetastic.space) |Memes|Yes|No| | [social.diskseven.com](https://social.diskseven.com) |Single user|No|No (DNS entry but no response)| | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No| | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| | [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes| -| [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| | [social.wxcafe.net](https://social.wxcafe.net) |Open registrations, federates everywhere, no moderation yet|Yes|Yes| @@ -36,6 +34,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [share.elouworld.org](https://share.elouworld.org)|N/A|No|No| | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No| | [manowar.social](https://manowar.social)|N/A|No|No| -| [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No| +| [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|N/A|No|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 080caa0dff863224b4f2d48fee5506f90c7f3f55 Mon Sep 17 00:00:00 2001 From: Angristan Date: Tue, 4 Apr 2017 19:23:53 +0200 Subject: [PATCH 09/60] Add file package If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media. --- 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 469fefa9..a70f174d 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -76,7 +76,7 @@ It is recommended to create a special user for mastodon on the server (you could ## General dependencies curl -sL https://deb.nodesource.com/setup_4.x | sudo bash - - sudo apt-get install imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev nodejs + sudo apt-get install imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev nodejs file sudo npm install -g yarn ## Redis From 72319ecf7bbbc03b433bdf75191ed5dd6a92fb19 Mon Sep 17 00:00:00 2001 From: Nope Nope Date: Tue, 4 Apr 2017 20:45:32 +0200 Subject: [PATCH 10/60] typo in admin doc s/rails/rake/ --- Running-Mastodon/Administration-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Running-Mastodon/Administration-guide.md b/Running-Mastodon/Administration-guide.md index af78f623..dd69eb30 100644 --- a/Running-Mastodon/Administration-guide.md +++ b/Running-Mastodon/Administration-guide.md @@ -7,7 +7,7 @@ So, you have a working Mastodon instance... now what? The following rake task: - rails mastodon:make_admin USERNAME=alice + rake mastodon:make_admin USERNAME=alice Would turn the local user "alice" into an admin. From 38bc079678725fd2ed785fb6d9f7f10ae70f63de Mon Sep 17 00:00:00 2001 From: Udo Kramer Date: Tue, 4 Apr 2017 23:45:29 +0200 Subject: [PATCH 11/60] Update Production-guide.md --- 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 469fefa9..ffe42b41 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -112,7 +112,7 @@ Then once `rbenv` is ready, run `rbenv install 2.3.1` to install the Ruby versio You need the `git-core` package installed on your system. If it is so, from the `mastodon` user: cd ~ - git clone https://github.com/Gargron/mastodon.git live + git clone https://github.com/tootsuite/mastodon.git live cd live Then you can proceed to install project dependencies: From eada9ae113ab6392c932a466f3ddb9b96d7ca0fa Mon Sep 17 00:00:00 2001 From: Ash Furrow Date: Tue, 4 Apr 2017 18:45:24 -0400 Subject: [PATCH 12/60] Adds instructions for adding admin users. --- Running-Mastodon/Heroku-guide.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Running-Mastodon/Heroku-guide.md b/Running-Mastodon/Heroku-guide.md index b66e5620..cd92a8bf 100644 --- a/Running-Mastodon/Heroku-guide.md +++ b/Running-Mastodon/Heroku-guide.md @@ -11,3 +11,5 @@ Mastodon can theoretically run indefinitely on a free [Heroku](https://heroku.co * 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. + +You may need to use the `heroku` CLI application to modify the database directly to give yourself administration rights. From 7e300a5e5717c81f712a02936cdc9baf9f7238eb Mon Sep 17 00:00:00 2001 From: Jason Snell Date: Tue, 4 Apr 2017 16:35:57 -0700 Subject: [PATCH 13/60] Adding https://mastodon.cc --- 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 677ec7e5..17a72d77 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -37,5 +37,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No| | [manowar.social](https://manowar.social)|N/A|No|No| | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No| +| [mastodon.cc](https://mastodon.cc)|Art|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 0a8023314b3b23084bc8acbd4e08b6d18f0159e0 Mon Sep 17 00:00:00 2001 From: Ash Furrow Date: Tue, 4 Apr 2017 20:53:31 -0400 Subject: [PATCH 14/60] Updates instructions. --- Running-Mastodon/Heroku-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Running-Mastodon/Heroku-guide.md b/Running-Mastodon/Heroku-guide.md index cd92a8bf..0de26230 100644 --- a/Running-Mastodon/Heroku-guide.md +++ b/Running-Mastodon/Heroku-guide.md @@ -12,4 +12,4 @@ Mastodon can theoretically run indefinitely on a free [Heroku](https://heroku.co * 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. -You may need to use the `heroku` CLI application to modify the database directly to give yourself administration rights. +You may need to use the `heroku` CLI application to run `USERNAME=yourUsername rails mastodon:make_admin` to make yourself an admin. From 417b143dc5e4343e71ee86f6d4702fe4bb2d0b76 Mon Sep 17 00:00:00 2001 From: Ash Furrow Date: Tue, 4 Apr 2017 21:35:45 -0400 Subject: [PATCH 15/60] Adds mastodon.technology --- 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 0cd3f18d..dbed1184 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -40,5 +40,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.nasqueron.org](https://social.nasqueron.org) |Dreamers, open source developers, free culture|Yes|Yes| | [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|Yes| | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| +| [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 84b533490dbeeaf9d9704346a77fee27d54bd3cd Mon Sep 17 00:00:00 2001 From: Jason Snell Date: Tue, 4 Apr 2017 18:43:21 -0700 Subject: [PATCH 16/60] SSL best practices for nginx --- Running-Mastodon/Production-guide.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Running-Mastodon/Production-guide.md b/Running-Mastodon/Production-guide.md index b1f7bd35..d539ddf6 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -11,10 +11,22 @@ map $http_upgrade $connection_upgrade { '' close; } +server { + listen 80; + listen [::]:80; + server_name example.com; + return 301 https://$host$request_uri; +} + server { listen 443 ssl; server_name example.com; + ssl_protocols TLSv1.2; + ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; + ssl_prefer_server_ciphers on; + ssl_session_cache shared:SSL:10m; + ssl_certificate /etc/letsencrypt/live/example.com/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/example.com/privkey.pem; From 679180e6f6938f8601bdb4f8921789eb130fb00e Mon Sep 17 00:00:00 2001 From: shel Date: Tue, 4 Apr 2017 21:47:13 -0400 Subject: [PATCH 17/60] Corrected misinformation regarding Direct Posts Unless something changed recently I have no clue why this said that direct posts do not federate because they do. --- Using-Mastodon/User-guide.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Using-Mastodon/User-guide.md b/Using-Mastodon/User-guide.md index f8018909..acd02f24 100644 --- a/Using-Mastodon/User-guide.md +++ b/Using-Mastodon/User-guide.md @@ -160,13 +160,13 @@ Toot privacy is handled independently of account privacy, and individually for e **Unlisted** toots are toggled with the "Do not display in public timeline" option in the Compose pane. They are visible to anyone following you and appear on your profile page to the public even without a Mastodon login, but do *not* appear to anyone viewing the Public Timeline while logged into Mastodon. -**Private** toots, finally, are toggled with the "Mark as private" switch. Private toots do not appear in the public timeline nor on your profile page to anyone viewing it unless they are on your Followers list. This means the option is of very limited use if your account is not also set to be private (as anyone can follow you without confirmation and thus see your private toots). However the separation of this means that if you *do* set your entire account to private, you can switch this option off on a toot to make unlisted or even public toots from your otherwise private account. +**Private** toots, finally, are toggled with the "Mark as private" switch. Private toots do not appear in the public timeline nor on your profile page to anyone viewing it unless they are on your Followers list. This means the option is of very limited use if your account is not also set to be private (as anyone can follow you without confirmation and thus see your private toots). However the separation of this means that if you *do* set your entire account to private, you can switch this option off on a toot to make unlisted or even public toots from your otherwise private account. Private posts are not encrypted. Make sure you trust your instance admin not to just read your private posts on the back-end. Private toots do not federate to other instances, unless you @mention a remote user. In this case, they will federate to their instance *and may appear there PUBLICLY*. A warning will be displayed if you're composing a private toot that will federate to another instance. Private toots cannot be boosted. If someone you follow makes a private toot, it will appear in your timeline with a padlock icon in place of the Boost icon. **NOTE** that remote instances may not respect this. -**Direct** messages are only visible to users you have @mentioned in them. This does *not* federate to protect your privacy (as other instances may ignore the "Direct" status and display the messages as public if they were to receive them), even if you have @mentioned a remote user. +**Direct** posts are only visible to users you have @mentioned in them and cannot be boosted. Like with private posts, you should be mindful that the remote instance may not respect this protocol. If you are discussing a sensitive matter you should move the conversation off of Mastodon. To summarise: @@ -175,7 +175,7 @@ Toot Privacy | Visible on Profile | Visible on Public Timeline | Federates to ot Public | Anyone incl. anonymous viewers | Yes | Yes Unlisted | Anyone incl. anonymous viewers | No | Yes Private | Followers only | No | Only remote @mentions -Direct | No | No | No +Direct | No | No | Only remote @mentions #### Blocking From a123777873ec9881041694acea33fd108a254513 Mon Sep 17 00:00:00 2001 From: scriptjunkie Date: Tue, 4 Apr 2017 23:21:00 -0500 Subject: [PATCH 18/60] Add https://securitymastod.one/ --- 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 0cd3f18d..6b6eda74 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -6,6 +6,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | Name | Theme/Notes, if applicable | Open Registrations | IPv6 | | -------------|-------------|---|---| | [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes|No| +| [securitymastod.one](https://securitymastod.one/) |Information security enthusiasts and pros|Yes|Yes| | [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|No| | [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|No| | [socially.constructed.space](https://socially.constructed.space) |Single user|No|No| From 7aeff85427c1508bf7a799a47de6a532f28a1465 Mon Sep 17 00:00:00 2001 From: Ian McDowell Date: Tue, 4 Apr 2017 23:43:57 -0500 Subject: [PATCH 19/60] Update List-of-Mastodon-instances.md Added mastodon.network. --- 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 0cd3f18d..8b8aba12 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -6,6 +6,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | Name | Theme/Notes, if applicable | Open Registrations | IPv6 | | -------------|-------------|---|---| | [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes|No| +| [mastodon.network](https://mastodon.network) |N/A|Yes|Yes| | [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|No| | [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|No| | [socially.constructed.space](https://socially.constructed.space) |Single user|No|No| From 26d688cd8097db65d71bf2d0a7cf0ff49984d1b1 Mon Sep 17 00:00:00 2001 From: Eugen Date: Wed, 5 Apr 2017 10:25:05 +0200 Subject: [PATCH 20/60] Fix API method URL typo --- Using-the-API/API.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-the-API/API.md b/Using-the-API/API.md index bc5ca3de..e09d8ac9 100644 --- a/Using-the-API/API.md +++ b/Using-the-API/API.md @@ -310,7 +310,7 @@ Returns a [Status](#status). #### Getting status context: - GET /api/v1/statuses/:id/contexts + GET /api/v1/statuses/:id/context Returns a [Context](#context). From 781c555ef5e1dfe8344667deb6d59f447358bb6d Mon Sep 17 00:00:00 2001 From: Angristan Date: Wed, 5 Apr 2017 10:44:08 +0200 Subject: [PATCH 21/60] ECDH only Disable DHE ciphers. We don't loose any compatibility as we already use TLS 1.2, and ECDH is faster and safer. Also, it's better so specify the curve. This is the conf I use here : https://tls.imirhil.fr/https/mstdn.io --- Running-Mastodon/Production-guide.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Running-Mastodon/Production-guide.md b/Running-Mastodon/Production-guide.md index d539ddf6..3912fd2b 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -23,7 +23,8 @@ server { server_name example.com; ssl_protocols TLSv1.2; - ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; + ssl_ciphers EECDH+AESGCM:EECDH+AES; + ssl_ecdh_curve secp384r1; ssl_prefer_server_ciphers on; ssl_session_cache shared:SSL:10m; From fa816b16c35097969d33afba1d5b935f0f2698e0 Mon Sep 17 00:00:00 2001 From: Jordan Guerder Date: Wed, 5 Apr 2017 10:52:56 +0200 Subject: [PATCH 22/60] Added mastodon.cx --- 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 d0bcf8c7..e726e5dc 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -7,6 +7,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | -------------|-------------|---|---| | [mastodon.social](https://mastodon.social) |Flagship, quick updates|No|No| | [securitymastod.one](https://securitymastod.one/) |Information security enthusiasts and pros|Yes|Yes| +| [mastodon.cx](https://mastodon.cx/) |Alternative Mastodon instance hosted in France|Yes|Yes| | [mastodon.network](https://mastodon.network) |N/A|Yes|Yes| | [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|No| | [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|No| From 5b33c53ab9c34743119622cbe0a9abbb9f72e903 Mon Sep 17 00:00:00 2001 From: Angristan Date: Wed, 5 Apr 2017 11:16:56 +0200 Subject: [PATCH 23/60] Add mstdn.io --- 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 d0bcf8c7..a23cdafd 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -21,6 +21,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| | [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes| | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes| +| [mstdn.io](https://mstdn.io) |N/A|Yes|Yes| | [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes| | [social.wxcafe.net](https://social.wxcafe.net) |Open registrations, federates everywhere, no moderation yet|Yes|Yes| | [octodon.social](https://octodon.social) |Open registrations, federates everywhere, cutest instance yet|Yes|Yes| From e4c064305972a43a25af465911476b05bb388f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Levieux?= Date: Wed, 5 Apr 2017 11:24:21 +0200 Subject: [PATCH 24/60] Add mastodon.partipirate.org --- 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 d0bcf8c7..0b1720e1 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -19,6 +19,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.diskseven.com](https://social.diskseven.com) |Single user|No|Yes| | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No| | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| +| [mastodon.partipirate.org](https://mastodon.partipirate.org) |French Pirate Part Instance - Politics and stuff|Yes|No| | [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes| | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes| | [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes| From 3d27b6da3a283e9df03c599e6e6e8c0823e762f9 Mon Sep 17 00:00:00 2001 From: nicobz25 Date: Wed, 5 Apr 2017 13:13:09 +0200 Subject: [PATCH 25/60] Update List-of-Mastodon-instances.md Add our mastodon instance :) Thanks ! --- 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 0b98f855..bf770dc4 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -46,5 +46,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|Yes| | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| +| [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 223fdffd15b100c3d4058728ef76fe76086748a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Levieux?= Date: Wed, 5 Apr 2017 13:19:34 +0200 Subject: [PATCH 26/60] Typography on partY --- Using-Mastodon/List-of-Mastodon-instances.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 0b98f855..435e5141 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -20,7 +20,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.diskseven.com](https://social.diskseven.com) |Single user|No|Yes| | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No| | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| -| [mastodon.partipirate.org](https://mastodon.partipirate.org) |French Pirate Part Instance - Politics and stuff|Yes|No| +| [mastodon.partipirate.org](https://mastodon.partipirate.org) |French Pirate Party Instance - Politics and stuff|Yes|No| | [social.targaryen.house](https://social.targaryen.house) |Federates everywhere, quick updates.|Yes|Yes| | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes| | [mstdn.io](https://mstdn.io) |N/A|Yes|Yes| From 5d21f259440d57c96fe1f5807630e8f1dabb0f15 Mon Sep 17 00:00:00 2001 From: Angristan Date: Wed, 5 Apr 2017 14:11:08 +0200 Subject: [PATCH 27/60] Add git and curl as dependencies In some VPS templates, they are not installed by default. --- Running-Mastodon/Production-guide.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Running-Mastodon/Production-guide.md b/Running-Mastodon/Production-guide.md index 3912fd2b..90e9c0de 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -88,8 +88,9 @@ It is recommended to create a special user for mastodon on the server (you could ## General dependencies + sudo apt-get install imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev nodejs file git curl curl -sL https://deb.nodesource.com/setup_4.x | sudo bash - - sudo apt-get install imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev nodejs file + apt-get intall nodejs sudo npm install -g yarn ## Redis From 018b5e7d09b87b276962a3e31364f7d07f75d563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?wxcaf=C3=A9?= Date: Wed, 5 Apr 2017 14:21:45 +0200 Subject: [PATCH 28/60] Update List-of-Mastodon-instances.md --- Using-Mastodon/List-of-Mastodon-instances.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 0b98f855..07a6a481 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -25,7 +25,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [masto.themimitoof.fr](https://masto.themimitoof.fr) |N/A|Yes|Yes| | [mstdn.io](https://mstdn.io) |N/A|Yes|Yes| | [social.imirhil.fr](https://social.imirhil.fr) |N/A|No|Yes| -| [social.wxcafe.net](https://social.wxcafe.net) |Open registrations, federates everywhere, no moderation yet|Yes|Yes| +| [social.wxcafe.net](https://social.wxcafe.net) |Open registrations, queer people, activists, safe as much as possible |Yes|Yes| | [octodon.social](https://octodon.social) |Open registrations, federates everywhere, cutest instance yet|Yes|Yes| | [mastodon.club](https://mastodon.club)|Open Registration, Open Federation, Mostly Canadians|Yes|No| | [hostux.social](https://hostux.social) |N/A|Yes|Yes| From 9bd27e68825eb324bf942727ef87268110e8c957 Mon Sep 17 00:00:00 2001 From: Padraig Fahy Date: Wed, 5 Apr 2017 14:00:35 +0100 Subject: [PATCH 29/60] Adding mastodon.irish --- 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 a14836b8..0972e553 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -28,6 +28,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [social.wxcafe.net](https://social.wxcafe.net) |Open registrations, queer people, activists, safe as much as possible |Yes|Yes| | [octodon.social](https://octodon.social) |Open registrations, federates everywhere, cutest instance yet|Yes|Yes| | [mastodon.club](https://mastodon.club)|Open Registration, Open Federation, Mostly Canadians|Yes|No| +| [mastodon.irish](https://mastodon.irish)|Open Registration|Yes|No| | [hostux.social](https://hostux.social) |N/A|Yes|Yes| | [social.alex73630.xyz](https://social.alex73630.xyz) |Francophones|Yes|Yes| | [oc.todon.fr](https://oc.todon.fr) |Modérée et principalement francophone, pas de tolérances pour misogynie/LGBTphobies/validisme/etc.|Yes|Yes| From a9265eadda7508d0dd1575ee960db76ec7a02982 Mon Sep 17 00:00:00 2001 From: Jonathan Hurter Date: Wed, 5 Apr 2017 16:00:48 +0200 Subject: [PATCH 30/60] Add doc --- Running-Mastodon/Scalingo-guide.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Running-Mastodon/Scalingo-guide.md diff --git a/Running-Mastodon/Scalingo-guide.md b/Running-Mastodon/Scalingo-guide.md new file mode 100644 index 00000000..6552056a --- /dev/null +++ b/Running-Mastodon/Scalingo-guide.md @@ -0,0 +1,13 @@ +Scalingo guide +============== + +[![Deploy on Scalingo](https://cdn.scalingo.com/deploy/button.svg)](https://my.scalingo.com/deploy?source=https://github.com/tootsuite/mastodon#master) + +1. Click the above button. +2. Fill in the options requested. + * 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. + +You may need to use the `scalingo` CLI application to run `USERNAME=yourUsername rails mastodon:make_admin` to make yourself an admin. From ef2fa2f3a8fb81aa7952513aad2dfcb737905ede Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 5 Apr 2017 16:02:47 +0200 Subject: [PATCH 31/60] Update List-of-Mastodon-instances.md --- 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 1f5be3a6..e0bb3d36 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [mastodon.top](https://mastodon.top) |N/A|Yes|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). From 38c548fc278d46d31c8f3ee3dc8ad303e8aab6f1 Mon Sep 17 00:00:00 2001 From: Technowix Date: Wed, 5 Apr 2017 16:18:52 +0200 Subject: [PATCH 32/60] Add niu.moe, cuz it's kawaii --- 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 1f5be3a6..2918db8e 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [niu.moe](https://niu.moe/)|:dolls: The most cutest node ever, FR/EN, anime and computer :balloon:|Yes|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). From 0470be78621ca0cb28973b975f7505794ac09c45 Mon Sep 17 00:00:00 2001 From: shel Date: Wed, 5 Apr 2017 10:58:41 -0400 Subject: [PATCH 33/60] Correct innacurate info and other fixes This guide was pretty out of date and also contained outright errors which were never true. I have updated it. --- Using-Mastodon/User-guide.md | 64 +++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/Using-Mastodon/User-guide.md b/Using-Mastodon/User-guide.md index acd02f24..e456de29 100644 --- a/Using-Mastodon/User-guide.md +++ b/Using-Mastodon/User-guide.md @@ -26,17 +26,17 @@ Mastodon User's Guide ## Intro -Mastodon is a social network application based on the GNU Social protocol. It behaves a lot like other social networks, especially Twitter, with one key difference - it is open-source and anyone can start their own server (also called an "*instance*"), and users of any instance can interact freely with those of other instances (called "*federation*"). Thus, it is possible for small communities to set up their own servers to use amongst themselves while also allowing interaction with other communities. +Mastodon is a social network application based on the OStatus protocol. It behaves a lot like other social networks, especially Twitter, with one key difference - it is open-source and anyone can start their own server (also called an "*instance*"), and users of any instance can interact freely with those of other instances (called "*federation*"). Thus, it is possible for small communities to set up their own servers to use amongst themselves while also allowing interaction with other communities. #### Decentralization and Federation Mastodon is a system decentralized through a concept called "*federation*" - rather than depending on a single person or organization to run its infrastructure, anyone can download and run the software and run their own server. Federation means different Mastodon servers can interact with each other seamlessly, similar to e.g. e-mail. -As such, anyone can download Mastodon and e.g. run it for a small community of people, but any user registered on that instance can follow and send and read posts from other Mastodon instances (as well as servers running other GNU Social-compatible services). This means that not only is users' data not inherently owned by a company with an interest in selling it to advertisers, but also that if any given server shuts down its users can set up a new one or migrate to another instance, rather than the entire service being lost. +As such, anyone can download Mastodon and e.g. run it for a small community of people, but any user registered on that instance can follow, send, and read posts from other Mastodon instances (as well as servers running other OStatus-compatible services, such as GNU Social and postActiv). This means that not only is users' data not inherently owned by a company with an interest in selling it to advertisers, but also that if any given server shuts down its users can set up a new one or migrate to another instance, rather than the entire service being lost. Within each Mastodon instance, usernames just appear as `@username`, similar to other services such as Twitter. Users from other instances appear, and can be searched for and followed, as `@user@servername.ext` - so e.g. `@gargron` on the `mastodon.social` instance can be followed from other instances as `@gargron@mastodon.social`). -Posts from users on external instances are "*federated*" into the local one, i.e. if `user1@mastodon1` follows `user2@gnusocial2`, any posts `user2@gnusocial2` makes appear in both `user1@mastodon`'s Home feed and the public timeline on the `mastodon1` server. Mastodon server administrators have some control over this and can exclude users' posts from appearing on the public timeline; post privacy settings from users on Mastodon instances also affect this, see below in the [Toot Privacy](User-guide.md#toot-privacy) section. +Posts from users on external instances are "*federated*" into the local one, i.e. if `user1@mastodon1` follows `user2@gnusocial2`, any posts `user2@gnusocial2` makes appear in both `user1@mastodon1`'s Home feed and the public timeline on the `mastodon1` server. Mastodon server administrators have some control over this and can exclude users' posts from appearing on the public timeline; post privacy settings from users on Mastodon instances also affect this, see below in the [Toot Privacy](User-guide.md#toot-privacy) section. ## Getting Started @@ -44,7 +44,7 @@ Posts from users on external instances are "*federated*" into the local one, i.e You can customise your Mastodon profile in a number of ways - you can set a custom "display" name, a profile "avatar" picture, a background image for your profile page header, and a short "bio" that summarises you or your account. -![Preferences icon](screenshots/preferences.png) To edit your profile, click the Preferences icon in the Compose column and select "Edit Profile" on the left-hand menu on the Preferences page. Your display name is limited to 30 characters, your bio to 160. Avatars and header pictures can be uploaded as png, gif or jpg images and cannot be larger than 2MB. They will be resized to standard sizes - 120x120 pixels for avatars, 700x335 pixels for header pictures. +![Preferences icon](screenshots/preferences.png) To edit your profile, click the Preferences icon in the Compose column and select "Edit Profile" on the left-hand menu on the Preferences page. Your display name is limited to 30 characters, your bio to 160. Avatars and header pictures can be uploaded as png, gif or jpg images and cannot be larger than 2MB. They will be resized to standard sizes - 120x120 pixels for avatars, 700x335 pixels for header pictures. #### E-Mail Notifications @@ -56,17 +56,17 @@ The most basic way to interact with Mastodon is to make a text post, also called If you want to reply to another user's toot, you can click the "Reply" icon on it. This will add their username to your input box along with a preview of the message you're replying to, and the user will receive a notification of your response. -Similarly, in order to start a conversation with another user, just mention their user name in your toot. When you type the @ symbol followed directly (without a space) by any character in a message, Mastodon will automatically start suggesting users that match the username you're typing. Like with replies, mentioning a user like this will send them a notification. +Similarly, in order to start a conversation with another user, just mention their user name in your toot. When you type the @ symbol followed directly (without a space) by any character in a message, Mastodon will automatically start suggesting users that match the username you're typing. Like with replies, mentioning a user like this will send them a notification. If the post starts with a mention, it will be treated as a reply and will only appear in the Home timelines of users who follow both you and the user you are mentioning. It will still be visible on your profile depending on privacy settings. ##### Content Warnings -When you want to post something that you don't want to be immediately visible - for example, spoilers for that film that's just out, or some personal thoughts that contain [triggers](http://www.bbc.co.uk/news/blogs-ouch-26295437), you can "hide" it behind a Content Warning. +When you want to post something that you don't want to be immediately visible - for example, spoilers for that film that's just come out, or some personal thoughts that mention potentially upsetting topics, you can "hide" it behind a Content Warning. To do this, click the ![CW icon](screenshots/compose-cw.png) "CW" switch under the Compose box. This will add another text box labeled "Content warning"; you should enter a short summary of what the "body" of your post contains here while your actual post goes into the "What is on your mind?" box as normal. ![animation showing how to enable content warnings](screenshots/content-warning.gif) -This will cause the body of your post to be hidden behind a "Show More" button in the timeline, with only the content warning visible by default: +This will cause the body of your post to be hidden behind a "Show More" button in the timeline, with only the content warning and any mentioned users visible by default: ![animation showing content warnings in the timeline](screenshots/cw-toot.gif) @@ -74,13 +74,13 @@ This will cause the body of your post to be hidden behind a "Show More" button i ##### Hashtags -If you're making a post belonging to a wider subject, it might be worth adding a "hashtag" to it. This can be done simply by adding any alphanumeric term with a # sign in front of it to the toot, e.g. #introductions (which is popular on mastodon.social for new users to introduce themselves to the community), or #politics for political discussions, etc. Clicking on a hashtag in a toot will show a timeline consisting only of toots that include this hashtag (i.e. it's a shortcut to searching for it). This allows users to group messages of similar subjects together, forming a separate "timeline" for people interested in that subject. +If you're making a post belonging to a wider subject, it might be worth adding a "hashtag" to it. This can be done simply by writing in the post a # sign followed by a phrase, e.g. #introductions (which is popular on mastodon.social for new users to introduce themselves to the community), or #politics for political discussions, etc. Clicking on a hashtag in a toot will show a timeline consisting only of public posts that include this hashtag (i.e. it's a shortcut to searching for it). This allows users to group messages of similar subjects together, forming a separate "timeline" for people interested in that subject. Hashtags can also be searched for from the search bar above the compose box. ##### Boosts and Favourites You can *favourite* another user's toot by clicking the star icon underneath. This will send the user a notification that you have marked their post as a favourite; the meaning of this varies widely by context from a general "I'm listening" to signalling agreement or offering support for the ideas expressed. -Additionally you can *boost* toots by clicking the "circular arrows" icon. Boosting a toot will show it on your profile timeline and make it appear to all your followers, even if they aren't following the user who made the original post. This is helpful if someone posts a message you think others should see, as it increases the message's reach while keeping the author information intact. +Additionally you can *boost* toots by clicking the "circular arrows" icon. Boosting a toot will show it on your profile timeline and make it appear to all your followers, even if they aren't following the user who made the original post. This is helpful if someone posts a message you think others should see, as it increases the message's reach while keeping the author information intact. #### Posting Images @@ -92,21 +92,21 @@ You can also attach video files or GIF animations to Toots. However, there is a #### Following Other Users -Following another user will make all of their toots as well as other users' toots which they [boost](User-guide.md#boosts-and-favourites) in your Home column. This gives you a separate timeline from the [federated timeline](User-guide.md#the-federated-timeline) in which you can read what particular people are up to without the noise of general conversation. +Following another user will make all of their toots as well as other users' toots which they [boost](User-guide.md#boosts-and-favourites) appear in your Home column. This gives you a separate timeline from the [public timelines](User-guide.md#the-public-timelines) in which you can read what particular people are up to without the noise of general conversation. ![Follow icon](screenshots/follow.png) In order to follow a user, click their name or avatar to open their profile, then click the Follow icon in the top left of their profile view. -If their account is locked (which is shown with a padlock icon ![Padlock icon](screenshots/locked-icon.png) next to their user name), they will receive a notification of your request to follow them and need to approve this before you are added to their follower list (and thus see their toots). To show you that you're waiting for someone to approve your follow request, the Follow icon ![Follow icon](screenshots/follow-icon.png) on their profile will be replaced with an hourglass icon ![Pending icon](screenshots/pending-icon.png). +If their account has a padlock icon ![Padlock icon](screenshots/locked-icon.png) next to their user name, they will receive a notification of your request to follow them and they will need to approve this before you are added to their follower list (and thus see their toots). To show you that you are waiting for someone to approve your follow request, the Follow icon ![Follow icon](screenshots/follow-icon.png) on their profile will be replaced with an hourglass icon ![Pending icon](screenshots/pending-icon.png). The requirement for new followers to be approved is something you can enable for your own profile under preferences. Once you follow a user, the Follow icon will be highlighted in blue on their profile ![Following icon](screenshots/following-icon.png); you can unfollow them again by clicking this. If you know someone's user name you can also open their profile for following by entering it in the [Search box](User-guide.md#searching) in the Compose column. This also works for remote users, though depending on whether they are known to your home instance you might have to enter their full name including the domain (e.g. `gargron@mastodon.social`) into the search box before their profile will appear in the suggestions. -Alternately, if you already have a user's profile open in a separate browser tab, most GNU Social-related networks should have a "Follow" or "Subscribe" button on their profile page. This will ask you to enter the full user name to follow **from** (ie. if your account is on mastodon.social you would want to enter this as `myaccount@mastodon.social`) +Alternately, if you already have a user's profile open in a separate browser tab, most OStatus-related networks should have a "Follow" or "Subscribe" button on their profile page. This will ask you to enter the full user name to follow **from** (ie. if your account is on mastodon.social you would want to enter this as `myaccount@mastodon.social`) #### Notifications -When someone follows your account or requests to follow you, mentions your user name (either as an initial message or in response to one of your toots) or boosts or favourites one of your toots, you will receive a notification for this. These will appear as desktop notifications on your computer (if your web browser supports this and you've enabled them) as well as in your "Notifications" column. +When someone follows your account or requests to follow you, mentions your user name, or boosts or favourites one of your toots, you will receive a notification for this. These will appear as desktop notifications on your computer (if your web browser supports this and you've enabled them) as well as in your "Notifications" column. ![Notification Settings icon](screenshots/notifications-settings.png) You can filter what kind of notifications you see in the Notifications column by clicking the Notification Settings icon at the top of the column and ticking or un-ticking what you do or don't want to see notifications for. @@ -116,21 +116,25 @@ When someone follows your account or requests to follow you, mentions your user #### Mobile Apps -There are no official mobile Mastodon apps for iOS or Android at this point. However, there are several third-party apps in development; you can find a list of these [here](Apps.md). +Mastodon has an open API, so anyone can develop a client or app to use Mastodon from anything. Many people have already developed mobile apps for iOS and Android. You can find a list of these [here](Apps.md). Many of these projects are also open source and welcome collaborators. -#### The Federated Timeline +#### The Public Timelines -Mastodon has a "Federated" timeline, which is a collection of all public toots made by all local users as well as posts from remote users that are federated (because someone on your instance follows the remote user making the post). This is a good way to meet new people to follow or interact with, but can be overwhelming especially if there's a lot of activity. +In addition to your Home timeline, there are two public timelines available. The Federated Timeline and the Local Timeline. These are both a good way to meet new people to follow or interact with. + +##### The Federated Timeline + +The Federated Timeline shows all public posts from all users "known" to your instance. This means the user is either on the same instance as you, or somebody on your instance follows that user. The Federated Timeline is a great way to engage in the broad chatter of the world. Following users on remote instances who you meet on the Federated Timeline can lead to meeting more users on more instances and further connecting your instance to more and more of the entire Mastodon and OStatus network. ![Federated Timeline icon](screenshots/federated-timeline.png) To view the federated timeline, click the "Federated Timeline" icon in your Compose column or the respective button on the Getting Started panel. To hide the federated timeline again, simply click the "Back" link at the top of the column while you're viewing it. #### The Local Timeline -In addition to the Federated Timeline, there's also a "Local" timeline, which only shows public toots made by users on your home instance. This is quieter than the Federated timeline, and useful if you want to stick close to your instance's community without having too much noise from outside. To view the Local Timeline, click the ![Menu icon](screenshots/compose-menu.png) Menu icon on the Compose pane and then select "Local Timeline" on the rightmost column. +The Local Timeline only shows public posts made by users on your home instance. This can be useful if your instance has particular community norms that users on other instances may not have, such as particular topics that get put under content warnings; or particular in-jokes and shared interests. To view the Local Timeline, click the ![Menu icon](screenshots/compose-menu.png) Menu icon on the Compose pane and then select "Local Timeline" on the rightmost column. #### Searching -Mastodon has a search function - however, this is limited to users and [hashtags](User-guide.md#hashtags) only and cannot be used to search through the full text of toots. In order to start a search, just type into the search box in the Compose column; Mastodon will automatically start showing suggestions of both user names and hashtags in a pop-up after a moment. Selecting any of these will open the user's profile or a view of all toots on the hashtag. +Mastodon has a search function - you can use it to search for users and [hashtags](User-guide.md#hashtags). The search does not look through the entire text of posts, only hashtags. In order to start a search, just type into the search box in the Compose column and hit *enter*; This will open the search pane. The search pane will show suggestions as you type. Selecting any of these will open the user's profile or a view of all toots on the hashtag. ## Privacy, Safety and Security @@ -140,7 +144,7 @@ Mastodon has a number of advanced security, privacy and safety features over mor Two-Factor Authentication (2FA) is a mechanism that improves the security of your Mastodon account by requiring a numeric code from another device (most commonly mobile phones) linked to your Mastodon account when you log in - this means that even if someone gets hold of both your e-mail address and your password, they cannot take over your Mastodon account as they would need a physical device you own to log in. -Mastodon's 2FA uses Google Authenticator (or compatible apps). You can install this for free to your [Android](https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2) or [iOS](https://itunes.apple.com/gb/app/google-authenticator/id388497605) device; [this Wikipedia page](https://en.wikipedia.org/wiki/Google_Authenticator#Implementations) lists further versions of the app for other systems. +Mastodon's 2FA uses Google Authenticator (or compatible apps, such as Authy). You can install this for free to your [Android](https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2) or [iOS](https://itunes.apple.com/gb/app/google-authenticator/id388497605) device; [this Wikipedia page](https://en.wikipedia.org/wiki/Google_Authenticator#Implementations) lists further versions of the app for other systems. ![Preferences icon](screenshots/preferences.png) In order to enable 2FA for your Mastodon account, click the Preferences icon in the Compose column, click "Two-factor Authentication" in the left menu on the settings page and follow the instructions. Once activated, every time you log in you will need a one-time code generated by the Authenticator app on the device you've linked to your account. @@ -154,18 +158,20 @@ To allow you more control over who can see your toots, Mastodon supports "privat #### Toot Privacy -Toot privacy is handled independently of account privacy, and individually for each toot. The three tiers of visibility for toots are Public (default), Unlisted or Private. In order to select your privacy level, click the ![Globe icon](screenshots/compose-privacy.png) globe icon. Changes to this setting are remembered between posts, i.e. if you make one private toot you will need to disable the switch again to make public toots. +Toot privacy is handled independently of account privacy, and individually for each toot. The four tiers of visibility for toots are Public (default), Unlisted, Private, and Direct. In order to select your privacy level, click the ![Globe icon](screenshots/compose-privacy.png) globe icon. Changes to this setting are remembered between posts, i.e. if you make one private toot, each toot you make will be private until you change it back to public. You can change your default post privacy under preferences. -**Public** is the default status of toots on accounts not set to private; a toot is public if neither of the two flags are set. Public toots are visible to any other user on the public timeline, federate to other GNU Social instances without restriction and appear on your user profile page to anyone including search engine bots and visitors who aren't logged into a Mastodon account. +**Public** is the default status of toots on most accounts. Public toots are visible to any other user on the public timelines, federate to other Mastodon and OStatus instances without restriction, and appear on your user profile page to anyone including search engine bots and visitors who aren't logged into a Mastodon account. -**Unlisted** toots are toggled with the "Do not display in public timeline" option in the Compose pane. They are visible to anyone following you and appear on your profile page to the public even without a Mastodon login, but do *not* appear to anyone viewing the Public Timeline while logged into Mastodon. +**Unlisted** toots are public, except that they do not appear in the public timelines or search results. They are visible to anyone following you and appear on your profile page to the public even without a Mastodon login. Other than not appearing in the public timelines or search results, they function identically to public posts. -**Private** toots, finally, are toggled with the "Mark as private" switch. Private toots do not appear in the public timeline nor on your profile page to anyone viewing it unless they are on your Followers list. This means the option is of very limited use if your account is not also set to be private (as anyone can follow you without confirmation and thus see your private toots). However the separation of this means that if you *do* set your entire account to private, you can switch this option off on a toot to make unlisted or even public toots from your otherwise private account. Private posts are not encrypted. Make sure you trust your instance admin not to just read your private posts on the back-end. - -Private toots do not federate to other instances, unless you @mention a remote user. In this case, they will federate to their instance *and may appear there PUBLICLY*. A warning will be displayed if you're composing a private toot that will federate to another instance. +**Private** toots do not appear in the public timeline nor on your profile page to anyone viewing it unless they are on your Followers list. The option is of limited use if your account is not also set to require approval of new followers (as anyone can follow you without confirmation and thus see your private toots). However the separation of this means that if you *do* set your entire account to private, you can switch this option off on a toot to make unlisted or even public toots from your otherwise private account. Private toots cannot be boosted. If someone you follow makes a private toot, it will appear in your timeline with a padlock icon in place of the Boost icon. **NOTE** that remote instances may not respect this. +Private toots do not federate to other instances, unless you @mention a remote user. In this case, they will federate to their instance, and users on that instance who follow both you and the @mentioned user will see it in their Home timelines. There is no reliable way to check if an instance will actually respect post privacy. Non-Mastodon servers, such as a GNU Social server, do not support Mastodon privacy settings. A user on GNU Social who you @mention in a private post would not even be aware that the post is intended to be private and would be able to boost it, which would undo the privacy setting. There is also no way to guarantee that someone could not just modify the code on their particular Mastodon instance to not respect private post restrictions. A warning will be displayed if you're composing a private toot that will federate to another instance. You should thus think through how much you trust the user you are @mentioning and the instance they are on. + +Private posts are not encrypted. Make sure you trust your instance admin not to just read your private posts on the back-end. Do not say anything you would not want potentially intercepted. + **Direct** posts are only visible to users you have @mentioned in them and cannot be boosted. Like with private posts, you should be mindful that the remote instance may not respect this protocol. If you are discussing a sensitive matter you should move the conversation off of Mastodon. To summarise: @@ -183,9 +189,13 @@ You can block a user to stop them contacting you. To do this, you can click or t **NOTE** that this will stop them from seeing your public toots while they are logged in, but they *will* be able to see your public toots by simply opening your profile in another browser that isn't logged into Mastodon (or logged into a different account that you have not blocked). -Mentions, favourites, boosts or any other interaction with you from a blocked user will be hidden from your view. You will not see replies to a blocked person, even if the reply mentions you, nor will you see their toots if someone boosts them. You will not see toots mentioning a blocked person except in the public timeline. +Mentions, favourites, boosts or any other interaction with you from a blocked user will be hidden from your view. You will not see replies to a blocked person, even if the reply mentions you, nor will you see their toots if someone boosts them. -The blocked user will not be notified of your blocking them. They will be removed from your followers, *but* will still be able to see any public toots you make. Blocks do not federate across instances. +The blocked user will not be notified of your blocking them. They will be removed from your followers. + +#### Muting + +If you do not wish to see posts from a particular user, but do not care about if they see your posts, you may choose to *mute* them. You can mute a user from the same menu on their profile page that you would block them from. You will not see posts from a muted user unless they @mention you. A muted user will have no way to know that you have them muted. #### Reporting Toots or Users From 5c28bc676b4cf43438b25da0bd5da2fb20c1a912 Mon Sep 17 00:00:00 2001 From: Kody Date: Wed, 5 Apr 2017 17:00:03 +0200 Subject: [PATCH 34/60] Added im-in.space --- 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 1f5be3a6..8b5fa27e 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [im-in.space](https://im-in.space/)|SPAAAAACE! Probably with a lot of French people. (Invite-only, might randomly open registrations)|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). From c3f536126a59291c335f2761a94d138931e00ac1 Mon Sep 17 00:00:00 2001 From: Jonathan Hurter Date: Wed, 5 Apr 2017 17:48:55 +0200 Subject: [PATCH 35/60] Make scalingo doc clearer --- Running-Mastodon/Scalingo-guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Running-Mastodon/Scalingo-guide.md b/Running-Mastodon/Scalingo-guide.md index 6552056a..9329f753 100644 --- a/Running-Mastodon/Scalingo-guide.md +++ b/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`. From f150c4923e7ad25faab9a4ff50fb15b8cada3086 Mon Sep 17 00:00:00 2001 From: Toby Deshane Date: Wed, 5 Apr 2017 11:49:36 -0400 Subject: [PATCH 36/60] Add social.bytestemplar.com to instances list --- 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 1f5be3a6..a99598ea 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [social.bytestemplar.com](https://social.bytestemplar.com)|N/A|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 7063dfd8e20c6068c4616093a5f8ef16dbdfd8a7 Mon Sep 17 00:00:00 2001 From: Ben Field Date: Wed, 5 Apr 2017 16:56:51 +0100 Subject: [PATCH 37/60] Update Production-guide.md Corrected spelling error for "install" --- 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 90e9c0de..1a65771c 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -90,7 +90,7 @@ It is recommended to create a special user for mastodon on the server (you could sudo apt-get install imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev nodejs file git curl curl -sL https://deb.nodesource.com/setup_4.x | sudo bash - - apt-get intall nodejs + apt-get install nodejs sudo npm install -g yarn ## Redis From 4d226de556157d1696612abe7aa34ec91c3a9097 Mon Sep 17 00:00:00 2001 From: Amanda Visconti Date: Wed, 5 Apr 2017 12:04:21 -0400 Subject: [PATCH 38/60] Added digitalhumanities.club instance --- 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 1f5be3a6..a295d282 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [digitalhumanities.club](http://www.digitalhumanities.club)|[Digital humanities](http://whatisdigitalhumanities.com) community; invitations will open once code of conduct drafted.|No|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 018e2fc68c961a3ce2c2f6f4eb3847a136a4dc01 Mon Sep 17 00:00:00 2001 From: ZiiX Date: Wed, 5 Apr 2017 09:05:57 -0700 Subject: [PATCH 39/60] added instance --- 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 1f5be3a6..80fa61ab 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [design.vu](https://design.vu)|— what's your design view‽|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 6aeaeb8b917b39c2f401d7d5b68fc92ad459c65b Mon Sep 17 00:00:00 2001 From: Thomas Alberola Date: Wed, 5 Apr 2017 18:15:39 +0200 Subject: [PATCH 40/60] =?UTF-8?q?Adding=20masto.raildecake.fr,=20french=20?= =?UTF-8?q?instance=20=F0=9F=8C=BB=F0=9F=90=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 1f5be3a6..23a2867a 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [masto.raildecake.fr](https://masto.raildecake.fr)|Hebergé chez un FAI associatif dans le sud de la france, grillons & pins en options|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 46c54a92b2e8d88123bb68e49ad109f6f58399b3 Mon Sep 17 00:00:00 2001 From: foxiehkins Date: Wed, 5 Apr 2017 17:47:52 +0100 Subject: [PATCH 41/60] Add good-dragon.com --- 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 1f5be3a6..99d01983 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [good-dragon.com](https://good-dragon.com/)|Relaxed moderation, Open registrations, Furries, Others also accepted|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 4e2c148ed6c2b638f2548ef0d9047303a12fa17b Mon Sep 17 00:00:00 2001 From: foxiehkins Date: Wed, 5 Apr 2017 17:49:04 +0100 Subject: [PATCH 42/60] Update description on good-dragon.com --- Using-Mastodon/List-of-Mastodon-instances.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 99d01983..5ffeecc1 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,6 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| -| [good-dragon.com](https://good-dragon.com/)|Relaxed moderation, Open registrations, Furries, Others also accepted|Yes|No| +| [good-dragon.com](https://good-dragon.com/)|Quick updates, Relaxed Moderation, Federates Everywhere, Furries|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From f5a90c886a0acd743cd2a04241f6828906650340 Mon Sep 17 00:00:00 2001 From: Christopher Gilbert Date: Wed, 5 Apr 2017 13:05:27 -0400 Subject: [PATCH 43/60] Add Rich.GOP --- 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 1f5be3a6..83b7b841 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [rich.gop](https://rich.gop/)|Federates everywhere, Open registration, Privacy respected|Yes|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). From c05a3a35698ea23995c3f653357c06656fb73a4d Mon Sep 17 00:00:00 2001 From: Ben Field Date: Wed, 5 Apr 2017 18:20:08 +0100 Subject: [PATCH 44/60] Update List-of-Mastodon-instances.md --- Using-Mastodon/List-of-Mastodon-instances.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 1f5be3a6..b4c2b863 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,5 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| - +| [social.nowa.re](https://social.nowa.re)|Open Registration|Yes|Not Yet| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From a5c7ec3bac9a84938fc49607d2bcea8441b4f4cf Mon Sep 17 00:00:00 2001 From: Brad Janke Date: Wed, 5 Apr 2017 13:14:27 -0500 Subject: [PATCH 45/60] Adds mtndevelopment --- 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 1f5be3a6..28f756bf 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [mastodon.mtndevelopment.com](https://mastodon.mtndevelopment.com/)|Open registration. General nerding out.|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 7fdf1f73811bb05b7bc10bb3deedfcf0de63d2b1 Mon Sep 17 00:00:00 2001 From: ava Date: Wed, 5 Apr 2017 21:44:13 +0300 Subject: [PATCH 46/60] Update List-of-Mastodon-instances.md --- Using-Mastodon/List-of-Mastodon-instances.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 1f5be3a6..3c72c2c1 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,5 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| - +| [mastodon.ml](http://mastodon.ml) |A chill place to hangout and chat about anime, programming and movies.|Yes|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). From 8fcaf14e3c597e4d2edba767b33f49e2ef1beb56 Mon Sep 17 00:00:00 2001 From: "Thibaut (Eychics)" Date: Wed, 5 Apr 2017 20:45:23 +0200 Subject: [PATCH 47/60] Add mastodon.nuzgo.net --- 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 1f5be3a6..26034c36 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -7,6 +7,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | -------------|-------------|---|---| | [mastodon.social](https://mastodon.social) |Flagship, quick updates|No|No| | [securitymastod.one](https://securitymastod.one/) |Information security enthusiasts and pros|Yes|Yes| +| [mastodon.nuzgo.net](https://mastodon.nuzgo.net/) |Mastodon instance hosted in Paris |Yes|No| | [mastodon.cx](https://mastodon.cx/) |Alternative Mastodon instance hosted in France|Yes|Yes| | [mastodon.network](https://mastodon.network) |N/A|Yes|Yes| | [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|No| From 408c29a78b549c57c95de00480ed248dfef36f74 Mon Sep 17 00:00:00 2001 From: Ninetailed Date: Wed, 5 Apr 2017 22:35:35 +0100 Subject: [PATCH 48/60] Description in instance list for mastodon.ninetailed.uk --- Using-Mastodon/List-of-Mastodon-instances.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 1f5be3a6..b6a8c65a 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -34,7 +34,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [oc.todon.fr](https://oc.todon.fr) |Modérée et principalement francophone, pas de tolérances pour misogynie/LGBTphobies/validisme/etc.|Yes|Yes| | [maly.io](https://maly.io) |N/A|Yes|No| | [social.lou.lt](https://social.lou.lt) |N/A|Yes|No| -| [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |N/A|Yes|No| +| [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |Open registrations, furry-friendly, UK-based|Yes|No| | [soc.louiz.org](https://soc.louiz.org) |"Coucou"|Yes|No| | [7nw.eu](https://7nw.eu) |N/A|Yes|No| | [mastodon.gougere.fr](https://mastodon.gougere.fr)|N/A|Yes|No| From 88ae4714ff51a1349c8b8e424ecb198b7660fed6 Mon Sep 17 00:00:00 2001 From: Nick Gerakines Date: Wed, 5 Apr 2017 19:19:44 -0400 Subject: [PATCH 49/60] Added off-the-clock.us to the list of instances --- 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 1f5be3a6..5404d6b6 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [off-the-clock.us](https://off-the-clock.us/)|The work day is over.|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 217cf85c930d967129aae41c70b4b909d871dfb9 Mon Sep 17 00:00:00 2001 From: Derek Lewis Date: Thu, 6 Apr 2017 01:11:16 -0400 Subject: [PATCH 50/60] Add infinimatix.net to instance list --- 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 1f5be3a6..1b91e00a 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [infinimatix.net](https://infinimatix.net)|Informatics|Yes|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). From 1cf59cbd8e8ebf4b6979494eb81f2ef3b898f88b Mon Sep 17 00:00:00 2001 From: Guewen FAIVRE Date: Thu, 6 Apr 2017 08:46:16 +0200 Subject: [PATCH 51/60] Add mastodon.elao.com instance --- 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 1f5be3a6..39d0cd68 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [mastodon.elao.com](https://mastodon.elao.com/)|OpenSource WebTech Agency. (France)|Yes|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From d8db9d82c12dc839763526bc7ddfa804f1fde001 Mon Sep 17 00:00:00 2001 From: Markus R Date: Thu, 6 Apr 2017 08:52:15 +0200 Subject: [PATCH 52/60] Update List-of-Mastodon-instances.md --- 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 1f5be3a6..69a58601 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [mastodon.cc](https://mastodon.cc)|Art|Yes|No| | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No| | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No| +| [social.0day.agency](https://social.0day.agency)|Infosec, Hacking, Fun (only protonmail)|Yes|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). From 77924befb2ecae95b4de0cc976326da76903e368 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 6 Apr 2017 12:16:39 -0400 Subject: [PATCH 53/60] Linux users must enable NFS for Vagrant --- Running-Mastodon/Vagrant-guide.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Running-Mastodon/Vagrant-guide.md b/Running-Mastodon/Vagrant-guide.md index b24f14e8..83a89240 100644 --- a/Running-Mastodon/Vagrant-guide.md +++ b/Running-Mastodon/Vagrant-guide.md @@ -17,6 +17,8 @@ To create and provision a new virtual machine for Mastodon development: cd mastodon vagrant up +**Note:** On Linux hosts, you will need to [enable NFS support](https://www.vagrantup.com/docs/synced-folders/nfs.html). + Running `vagrant up` for the first time will run provisioning, which will: - Download the Ubuntu 14.04 base image, if there isn't already a copy on your machine @@ -61,4 +63,4 @@ To run the `rspec` tests and `rubocop` style checker, you may either: ## Support/help -If you are confused, or having any issues with the above, the Mastodon IRC channel ( irc.freenode.net #mastodon ) is a good place to find assistance. \ No newline at end of file +If you are confused, or having any issues with the above, the Mastodon IRC channel ( irc.freenode.net #mastodon ) is a good place to find assistance. From 097db95bd3317ebccf33976bafa24dcfdc0f6829 Mon Sep 17 00:00:00 2001 From: Jantso Porali Date: Fri, 7 Apr 2017 12:58:12 +0200 Subject: [PATCH 54/60] Update Finnish translations, add sample Minio config (#954) --- Using-Mastodon/FAQ.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Using-Mastodon/FAQ.md b/Using-Mastodon/FAQ.md index daedcbdd..3b03a8ee 100644 --- a/Using-Mastodon/FAQ.md +++ b/Using-Mastodon/FAQ.md @@ -36,8 +36,9 @@ While Mastodon is compatible with GNU social in terms of server to server commun Because Mastodon has been created from a blank slate, it is much simpler to have the API mirror internal structures as closely as possible, rather than build an emulation layer. Secondly, the GNU social client API is actually a half-way implementation of the legacy Twitter API - that's the reason why it works with some older Twitter client apps. However, many of those apps are not maintained anymore, the GNU social API does not actually keep up with the real Twitter API and never fully implemented all its features; at the same time, the Twitter API was never meant for a federated service and so obscures some of the functionality. + #### How is Mastodon funded? Development of Mastodon and hosting of mastodon.social is funded through my [Patreon (also BTC/PayPal donations)](https://www.patreon.com/user?u=619786). Beyond that, I am not interested in VC funding, monetizing, advertising, or anything of that sort. I could offer setup/maintenance services on demand. -The software is free and open source and communities should host their own servers if they can, that way the costs are more or less distributed. Obviously it'd be hard for me to pay the bills if literally everyone decided to use the mastodon.social instance only. \ No newline at end of file +The software is free and open source and communities should host their own servers if they can, that way the costs are more or less distributed. Obviously it'd be hard for me to pay the bills if literally everyone decided to use the mastodon.social instance only. From f26e10dd999e7afb3e5ef9019ca2fab5bcbe026d Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 7 Apr 2017 11:34:10 -0400 Subject: [PATCH 55/60] Update heroku instructions --- Running-Mastodon/Heroku-guide.md | 55 +++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/Running-Mastodon/Heroku-guide.md b/Running-Mastodon/Heroku-guide.md index 0de26230..754f923e 100644 --- a/Running-Mastodon/Heroku-guide.md +++ b/Running-Mastodon/Heroku-guide.md @@ -3,13 +3,52 @@ Heroku guide [![Deploy](https://www.herokucdn.com/deploy/button.svg)](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. +Mastodon can be run on a free [Heroku](https://heroku.com) app. It should be +noted this has limited testing and could have unpredictable results. -1. Click the above button. -2. Fill in the options requested. - * 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 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. +## Basic setup -You may need to use the `heroku` CLI application to run `USERNAME=yourUsername rails mastodon:make_admin` to make yourself an admin. +Click the button above to start creating a Heroku app with the Mastodon repo as +the source. This tells Heroku to use the `app.json` file which does things like +prompt for config variables, set up the right buildpacks, run a postdeploy task, +and add the appropriate addons. + +If you don't use the deploy button and app.json approach, you will need to do +some of that manually. + +## Domain names and SSL + +You can add your domain name to the Heroku app's setting, and then also use +Heroku's (free) auto renewal program for Lets Encrypt certificates, by +requesting a cert from the settings screen. You'll have to point your hostname +DNS at Heroku using the values heroku gives you on this screen, using whatever +method is appropriate for your DNS setup. + +You should set the Heroku config vars of `LOCAL_DOMAIN` to your hostname, and +`LOCAL_HTTPS` to "true" as well. + +## Email + +Consider using [Mailgun](https://mailgun.com) or similar, who offer free plans +that should suit your interests. Look in `production.rb` to see which config +variables need to be set on Heroku for outgoing email to work. + +## File storage + +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. + +## Deployment + +You can deploy from the Heroku web interface or from the command line. Run: + + `heroku run rails db:migrate` + +after you first deploy to set up the first database. + +You may need to use the `heroku` CLI application to run: + + `USERNAME=yourUsername rails mastodon:make_admin` + +to make yourself an admin. From b130db887e73a12473858c9c6adb20a7bb6c1426 Mon Sep 17 00:00:00 2001 From: Ed Knutson Date: Fri, 7 Apr 2017 14:10:39 -0500 Subject: [PATCH 56/60] change suggested cipher for nginx --- 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 90e9c0de..1dba5613 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -24,7 +24,7 @@ server { ssl_protocols TLSv1.2; ssl_ciphers EECDH+AESGCM:EECDH+AES; - ssl_ecdh_curve secp384r1; + ssl_ecdh_curve prime256v1; ssl_prefer_server_ciphers on; ssl_session_cache shared:SSL:10m; From 7123e2cb5ac3482d85abfc86e8056422dd0bf879 Mon Sep 17 00:00:00 2001 From: seekr Date: Fri, 7 Apr 2017 16:33:13 -0300 Subject: [PATCH 57/60] typo --- 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 90e9c0de..1a65771c 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -90,7 +90,7 @@ It is recommended to create a special user for mastodon on the server (you could sudo apt-get install imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev nodejs file git curl curl -sL https://deb.nodesource.com/setup_4.x | sudo bash - - apt-get intall nodejs + apt-get install nodejs sudo npm install -g yarn ## Redis From 774b752498e4925a18089cf1586817bb2916ee52 Mon Sep 17 00:00:00 2001 From: David Huerta Date: Fri, 7 Apr 2017 17:44:32 -0400 Subject: [PATCH 58/60] Update Heroku-guide.md Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit. --- Running-Mastodon/Heroku-guide.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Running-Mastodon/Heroku-guide.md b/Running-Mastodon/Heroku-guide.md index 754f923e..269bc633 100644 --- a/Running-Mastodon/Heroku-guide.md +++ b/Running-Mastodon/Heroku-guide.md @@ -47,8 +47,6 @@ You can deploy from the Heroku web interface or from the command line. Run: after you first deploy to set up the first database. -You may need to use the `heroku` CLI application to run: +To make yourself an admin, you may need to use the `heroku` CLI application after creating an account online: - `USERNAME=yourUsername rails mastodon:make_admin` - -to make yourself an admin. + `heroku rake mastodon:make_admin USERNAME=yourUsername` From be8680df9ae70fab75d6fb3bdeb62c32d9ea09e5 Mon Sep 17 00:00:00 2001 From: benklop Date: Fri, 7 Apr 2017 16:31:50 -0600 Subject: [PATCH 59/60] Update Administration-guide.md the syntax for running the rake task wasn't correct. --- Running-Mastodon/Administration-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Running-Mastodon/Administration-guide.md b/Running-Mastodon/Administration-guide.md index dd69eb30..09b0f1df 100644 --- a/Running-Mastodon/Administration-guide.md +++ b/Running-Mastodon/Administration-guide.md @@ -7,7 +7,7 @@ So, you have a working Mastodon instance... now what? The following rake task: - rake mastodon:make_admin USERNAME=alice + RAILS_ENV=production bundle exec rails mastodon:make_admin USERNAME=alice Would turn the local user "alice" into an admin. From c96ef27f44523b96e386061698bcdbb6350e84ad Mon Sep 17 00:00:00 2001 From: Ray Alez Date: Fri, 7 Apr 2017 15:56:02 -0700 Subject: [PATCH 60/60] Add HackerNewsBot I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list. --- Using-Mastodon/Apps.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Using-Mastodon/Apps.md b/Using-Mastodon/Apps.md index 67b14dc2..b5e1fa36 100644 --- a/Using-Mastodon/Apps.md +++ b/Using-Mastodon/Apps.md @@ -13,5 +13,6 @@ Some people have started working on apps for the Mastodon API. Here is a list of |Albatross|iOS||[@goldie_ice@mastodon.social](https://mastodon.social/users/goldie_ice)| |Tooter|Chrome||[@effy@mastodon.social](https://mastodon.social/users/effy)| |tootstream|CLI||[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)| +|HackerNewsBot|CLI||[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)| If you have a project like this, let me know so I can add it to the list!