From ef2fa2f3a8fb81aa7952513aad2dfcb737905ede Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 5 Apr 2017 16:02:47 +0200 Subject: [PATCH 01/39] 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 02/39] 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 5c28bc676b4cf43438b25da0bd5da2fb20c1a912 Mon Sep 17 00:00:00 2001 From: Kody Date: Wed, 5 Apr 2017 17:00:03 +0200 Subject: [PATCH 03/39] 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 f150c4923e7ad25faab9a4ff50fb15b8cada3086 Mon Sep 17 00:00:00 2001 From: Toby Deshane Date: Wed, 5 Apr 2017 11:49:36 -0400 Subject: [PATCH 04/39] 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 05/39] 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 06/39] 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 07/39] 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 08/39] =?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 09/39] 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 10/39] 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 11/39] 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 12/39] 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 13/39] 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 14/39] 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 15/39] 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 16/39] 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 17/39] 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 97a57727401886d1ebd46ad9309967eb011b2a42 Mon Sep 17 00:00:00 2001 From: Jack Michaud Date: Wed, 5 Apr 2017 20:58:21 -0400 Subject: [PATCH 18/39] Add Northeastern University Mastodon --- 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..cf56d8c3 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| +| [neumastodon.com](https://neumastodon.com/)|Northeastern University Mastodon | 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 19/39] 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 20/39] 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 21/39] 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 53366cfcf3ea8bec37a293c61447d203eeb91cec Mon Sep 17 00:00:00 2001 From: Yann GUERN Date: Thu, 6 Apr 2017 11:07:33 +0200 Subject: [PATCH 22/39] Update List-of-Mastodon-instances.md Add mastodon.land 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..e4866e76 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -20,6 +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.land](https://mastodon.land) |N/A|Yes|Yes| | [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| From cca0f11f6d7e02c1bfef9c91cb767df07e9ed332 Mon Sep 17 00:00:00 2001 From: Ray Alez Date: Thu, 6 Apr 2017 03:12:34 -0700 Subject: [PATCH 23/39] Added an instance to the list Just launched https://hackertribe.io/, added it to the 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..bd1e6cd1 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| +| [hackertribe.io](https://hackertribe.io) |Community of people who are interested in Startups, Programming, Science, and Technology.|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| From 50d9f65682da32ba59324b631831a9c49570288f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20F=C3=BClling?= Date: Thu, 6 Apr 2017 14:22:01 +0200 Subject: [PATCH 24/39] add my 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..1910a924 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| +| [kagrumez.lerk.io](https://kagrumez.lerk.io)|Open registration. German end english.|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 e2965d2cb13e10a21ec95247173aac790d8648a9 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 6 Apr 2017 14:51:42 +0200 Subject: [PATCH 25/39] Add meow.social --- 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..b25c513e 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| +| [meow.social](https://meow.social)|A furry fandom focused instance|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 3946a8fda64f33ccc6f394b4635fa8fe4a5e5867 Mon Sep 17 00:00:00 2001 From: awea Date: Thu, 6 Apr 2017 18:07:15 +0200 Subject: [PATCH 26/39] 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..22776e21 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| +| [dancingbanana.party](https://dancingbanana.party)|La banane qui danse.|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 09d4ec48216c83009d3f9534e1b2e5fc53c42458 Mon Sep 17 00:00:00 2001 From: kadiix Date: Thu, 6 Apr 2017 19:15:57 +0200 Subject: [PATCH 27/39] Add an 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..659835d7 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.brussels.fr](https://mastodon.brussels/)|Le mastodon pour les belges, si vous aimez la bonne ambiance venez nous rejoindre !|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 64fff2802216f151d4cc0ca52246a3b15a4bb7ce Mon Sep 17 00:00:00 2001 From: kadiix Date: Thu, 6 Apr 2017 19:33:17 +0200 Subject: [PATCH 28/39] 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 659835d7..12c8aa43 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| - [mastodon.brussels.fr](https://mastodon.brussels/)|Le mastodon pour les belges, si vous aimez la bonne ambiance venez nous rejoindre !|Yes|Yes| +| [mastodon.brussels.fr](https://mastodon.brussels/)|Le mastodon pour les belges, si vous aimez la bonne ambiance venez nous rejoindre !|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 075411f716d61070a75844df28e06ffed1336858 Mon Sep 17 00:00:00 2001 From: Erwan Leboucher Date: Thu, 6 Apr 2017 20:18:56 +0200 Subject: [PATCH 29/39] 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..10b31a5d 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.llamasweet.tech](https://mastodon.llamasweet.tech/)|Mastodon about Android developement|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 7053ff9f6d499399696502b1084ca9f303301975 Mon Sep 17 00:00:00 2001 From: isati Date: Thu, 6 Apr 2017 19:31:25 +0100 Subject: [PATCH 30/39] Add manx.social 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..a0dfd1a9 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| +| [manx.social](https://manx.social/)|Instance for the Isle of Man|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 0718e1d3dc57ae56ed8072957b047445d5a85b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Mah=C3=A9?= Date: Thu, 6 Apr 2017 12:05:37 -0700 Subject: [PATCH 31/39] Added pericles.world in 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..b5bc1aa9 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.pericles.world](https://mastodon.pericles.world/)|Lightly moderated, federates everywhere and has a follow bot ( Huge federated timeline )|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 dc2ef960f74d4923fa299d25c9bbef2bcb9d080d Mon Sep 17 00:00:00 2001 From: YDrogen Date: Thu, 6 Apr 2017 23:59:56 +0200 Subject: [PATCH 32/39] Added masto.razrnet.fr --- Using-Mastodon/List-of-Mastodon-instances.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 1f5be3a6..aa89e90d 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -17,6 +17,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)|No|No| | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes|No| | [memetastic.space](https://memetastic.space) |Memes|Yes|No| +| [masto.razrnet.fr](https://masto.razrnet.fr) |Instance Française pour tout le monde ! Développeurs, gamers, etc...|Yes|No| | [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| From 0bde1b7f4e893a667cd4a88e259598d01fe03b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Mah=C3=A9?= Date: Thu, 6 Apr 2017 17:18:40 -0700 Subject: [PATCH 33/39] updated instance hostname --- 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 b5bc1aa9..c132c68a 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| -| [mastodon.pericles.world](https://mastodon.pericles.world/)|Lightly moderated, federates everywhere and has a follow bot ( Huge federated timeline )|Yes|No| +| [mastodon.host](https://mastodon.host/)|Lightly moderated, federates everywhere and has a follow bot ( Huge federated timeline )|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 f26e10dd999e7afb3e5ef9019ca2fab5bcbe026d Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 7 Apr 2017 11:34:10 -0400 Subject: [PATCH 34/39] 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 35/39] 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 36/39] 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 37/39] 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 38/39] 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 39/39] 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!