Commit Graph

272 Commits (2f1fdd37d30acf28cc60be533c97d65774d3b16a)

Author SHA1 Message Date
Shel R 0b90a13f45 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00
Shel R 81b63dc586 Merge branch 'master' into master 2017-04-07 22:13:06 -04:00
Shel R acd9cc8a6d Merge branch 'master' into patch-2 2017-04-07 22:11:24 -04:00
Shel R 7c16bd512c Merge branch 'master' into patch-1 2017-04-07 22:09:55 -04:00
Shel R fc78bf502e Merge branch 'master' into master 2017-04-07 22:08:54 -04:00
Shel R fc48d7d27d Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R 03bc0d99b3 Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R 8b56cdd949 Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R baad719a67 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R c442d045a0 Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00
Shel R db00112413 Merge branch 'master' into patch-1 2017-04-07 21:42:10 -04:00
Shel R ac2515e096 Merge branch 'master' into patch-1 2017-04-07 21:34:41 -04:00
David Huerta 9c0ca6f26d Merge branch 'master' into patch-1 2017-04-07 19:46:07 -04:00
Eugen 714156e409 Merge pull request #1204 from benklop/patch-1
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
Eugen 9eefb51a2f Merge pull request #1200 from huertanix/patch-2
Update Heroku-guide.md
2017-04-08 01:00:06 +02:00
Ray Alez 5b2be91d40 Add HackerNewsBot
I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.
2017-04-07 15:56:02 -07:00
benklop 36e31bf45e Update Administration-guide.md
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
David Huerta 7ab5218c65 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.
2017-04-07 17:44:32 -04:00
David Huerta fbfb94ca00 Update Heroku-guide.md
Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing.
2017-04-07 17:29:21 -04:00
Blake 7ede8d0b5a Add indigo.zone to list of instances 2017-04-07 14:10:37 -07:00
Mouse Reeve be2e5c4f53 Adds Oulipo.social to Mastodons list
This is a Mastodon with a particular constraint about
what symbols you can post.
2017-04-07 14:06:49 -07:00
Eugen f74fb89cbd Merge pull request #1191 from d3vgru/master
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
Eugen 895201fd9d Merge pull request #1172 from mjankowski/mj-heroku-docs
Update heroku instructions
2017-04-07 22:50:31 +02:00
seekr 231db3cdc1 typo 2017-04-07 16:33:13 -03:00
Ed Knutson 26b92ae438 change suggested cipher for nginx 2017-04-07 14:10:39 -05:00
Aguay-val 14bd321fca Add mastodon.fun 2017-04-07 20:33:52 +02:00
Matt Jankowski 5a85b7f4fe Update heroku instructions 2017-04-07 12:50:29 -04:00
foxiehkins f5a5571f64 Merge branch 'master' into master 2017-04-07 14:01:20 +01:00
Jantso Porali fb0ce9d38d Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Sergei Č 44ded06f3b Update List-of-Mastodon-instances.md 2017-04-07 11:54:41 +03:00
Tristan Mahé a80680cf3f updated instance hostname 2017-04-06 17:18:40 -07:00
Vladimir Mincev bfe3d5a719 Update Production-guide.md
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02:00
YDrogen cee4b3a359 Added masto.razrnet.fr 2017-04-06 23:59:56 +02:00
Tristan Mahé fe26dd71ad Added pericles.world in the list of instances 2017-04-06 12:05:37 -07:00
isati 7b92127188 Add manx.social instance 2017-04-06 19:31:25 +01:00
Erwan Leboucher a1e37a05f9 Update List-of-Mastodon-instances.md 2017-04-06 20:18:56 +02:00
kadiix 81bb50a15b Update List-of-Mastodon-instances.md 2017-04-06 19:33:17 +02:00
kadiix 5d5bda0c72 Merge branch 'master' into patch-1 2017-04-06 19:32:31 +02:00
Eugen 9df50099a1 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click
Cosmetic changes to the scalingo deployment
2017-04-06 19:32:12 +02:00
kadiix 1c8d5e7db7 Add an instance. 2017-04-06 19:15:57 +02:00
VirtuBox 4564e512e7 Merge branch 'master' into patch-1 2017-04-06 19:11:39 +02:00
Alex Gleason d1527b2d94 Linux users must enable NFS for Vagrant 2017-04-06 12:16:39 -04:00
awea 6246bba93f Update List-of-Mastodon-instances.md 2017-04-06 18:07:15 +02:00
Julien fe6a70c0f1 Add meow.social 2017-04-06 14:51:42 +02:00
Lukas Fülling dbecfabbfe add my instance 2017-04-06 14:22:01 +02:00
Ray Alez fc62c55e32 Added an instance to the list
Just launched https://hackertribe.io/, added it to the list.
2017-04-06 03:12:34 -07:00
Yann GUERN 983d73a311 Update List-of-Mastodon-instances.md
Add mastodon.land instance
2017-04-06 11:07:33 +02:00
Markus R fa776ec958 Update List-of-Mastodon-instances.md 2017-04-06 08:52:15 +02:00
Guewen FAIVRE 51c0e1d4eb Add mastodon.elao.com instance 2017-04-06 08:46:16 +02:00
Derek Lewis f153ff9b65 Add infinimatix.net to instance list 2017-04-06 01:15:16 -04:00
Jack Michaud 5b51509eb9 Add Northeastern University Mastodon 2017-04-05 20:58:21 -04:00
Nick Gerakines f42b23c2e2 Added off-the-clock.us to the list of instances 2017-04-05 19:19:44 -04:00
Ninetailed e2dd644eae Description in instance list for mastodon.ninetailed.uk 2017-04-05 22:35:35 +01:00
Thibaut (Eychics) e0908be254 Add mastodon.nuzgo.net 2017-04-05 20:45:23 +02:00
ava d7f33066b7 Update List-of-Mastodon-instances.md 2017-04-05 21:44:13 +03:00
Brad Janke 9999d134dd Adds mtndevelopment 2017-04-05 13:14:27 -05:00
Ben Field 5455080fae Update List-of-Mastodon-instances.md 2017-04-05 18:20:08 +01:00
Christopher Gilbert d67299887a Add Rich.GOP 2017-04-05 13:05:27 -04:00
foxiehkins 8abe6c0a32 Update description on good-dragon.com 2017-04-05 17:49:04 +01:00
foxiehkins e22f32e058 Add good-dragon.com 2017-04-05 17:47:52 +01:00
Thomas Alberola 84af4bbe59 Adding masto.raildecake.fr, french instance 🌻🐘 2017-04-05 18:15:39 +02:00
ZiiX 9e99e00b5a added instance 2017-04-05 09:05:57 -07:00
Amanda Visconti 47f8766d70 Added digitalhumanities.club instance 2017-04-05 12:04:21 -04:00
Toby Deshane 59e1298b80 Add social.bytestemplar.com to instances list 2017-04-05 11:49:36 -04:00
Jonathan Hurter f210b2b7ef Make scalingo doc clearer 2017-04-05 17:48:55 +02:00
Kody 41f34e7412 Added im-in.space 2017-04-05 17:00:03 +02:00
shel fd0096f899 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.
2017-04-05 10:58:41 -04:00
Eugen b89f37e445 Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
Technowix d5f05d07d6 Add niu.moe, cuz it's kawaii 2017-04-05 16:18:52 +02:00
VirtuBox 8a360d4292 Update List-of-Mastodon-instances.md 2017-04-05 16:02:47 +02:00
Jonathan Hurter 8752dc9186 Add doc 2017-04-05 16:00:48 +02:00
Eugen 437bc1880b Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen 676763dbc8 Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Padraig Fahy 9efa03d2be Adding mastodon.irish 2017-04-05 14:00:35 +01:00
Eugen 3a39a67901 Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
Eugen db522ed61a Merge pull request #931 from farlistener/patch-3
Typography on partY
2017-04-05 14:57:14 +02:00
wxcafé 37bd8d45ed Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Angristan 0bd1bdfc44 Add git and curl as dependencies
In some VPS templates, they are not installed by default.
2017-04-05 14:11:08 +02:00
Cédric Levieux 06d3e7dbba Typography on partY 2017-04-05 13:19:34 +02:00
nicobz25 6ea25d695a Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
Eugen 7395c62367 Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
2017-04-05 12:33:02 +02:00
Eugen dd4cec6699 Merge pull request #925 from Angristan/patch-6
Add mstdn.io
2017-04-05 12:26:17 +02:00
Eugen 786dabefed Merge pull request #926 from farlistener/patch-2
Add mastodon.partipirate.org
2017-04-05 12:26:02 +02:00
Valentin_NC b6212ffe1c add mastodon.cloud to List of instances 2017-04-05 20:36:21 +11:00
Cédric Levieux 9e06446d65 Add mastodon.partipirate.org 2017-04-05 11:24:21 +02:00
Angristan 17fb783672 Add mstdn.io 2017-04-05 11:16:56 +02:00
Jordan Guerder 3a98afd3e9 Added mastodon.cx 2017-04-05 10:52:56 +02:00
Angristan 53a01b38b2 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
2017-04-05 10:44:08 +02:00
Eugen 3975f92b8d Merge branch 'master' into master 2017-04-05 10:29:52 +02:00
Eugen f8fd1e8a29 Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
Eugen 4d46908556 Merge pull request #911 from IMcD23/patch-1
Added mastodon.network instance.
2017-04-05 10:28:58 +02:00
Eugen b41e48ffe4 Merge pull request #902 from asm/ssl_best_practices
SSL best practices for nginx
2017-04-05 10:26:32 +02:00
Eugen 1f7dccf535 Fix API method URL typo 2017-04-05 10:25:05 +02:00
Ian McDowell 628dfbb363 Update List-of-Mastodon-instances.md
Added mastodon.network.
2017-04-04 23:43:57 -05:00
scriptjunkie 940dedab78 Add https://securitymastod.one/ 2017-04-04 23:23:15 -05:00
shel b6a6a0d3d9 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.
2017-04-04 21:47:13 -04:00
Jason Snell 413d87cd50 SSL best practices for nginx 2017-04-04 18:43:21 -07:00
Ash Furrow 026dafe912 Adds mastodon.technology 2017-04-04 21:35:45 -04:00
Eugen 1bb3d8d3f5 Merge pull request #885 from optikfluffel/patch-1
Update Production-guide.md
2017-04-05 03:24:08 +02:00
Eugen cb1617245b Merge branch 'master' into patch-1 2017-04-05 03:20:37 +02:00