Commit Graph

152 Commits

Author SHA1 Message Date
Eugen
b142a2ebf5 Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
Jonathan Hurter
d6bab0c71c Add doc 2017-04-05 16:00:48 +02:00
Eugen
a371a9e002 Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen
be807ff7bd Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Padraig Fahy
cbcfd92a14 Adding mastodon.irish 2017-04-05 14:00:35 +01:00
Eugen
b45b4865a7 Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
Eugen
188172c401 Merge pull request #931 from farlistener/patch-3
Typography on partY
2017-04-05 14:57:14 +02:00
wxcafé
259e626165 Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Angristan
5ed2de6be2 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
85c768bf16 Typography on partY 2017-04-05 13:19:34 +02:00
nicobz25
9572282a55 Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
Eugen
f8a5ff95ec Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
2017-04-05 12:33:02 +02:00
Eugen
af0decf597 Merge pull request #925 from Angristan/patch-6
Add mstdn.io
2017-04-05 12:26:17 +02:00
Eugen
ba5e23ecce Merge pull request #926 from farlistener/patch-2
Add mastodon.partipirate.org
2017-04-05 12:26:02 +02:00
Cédric Levieux
bdf3ac95b8 Add mastodon.partipirate.org 2017-04-05 11:24:21 +02:00
Angristan
fa6f7c8898 Add mstdn.io 2017-04-05 11:16:56 +02:00
Jordan Guerder
5963fce131 Added mastodon.cx 2017-04-05 10:52:56 +02:00
Angristan
5dbcd92193 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
8b8839978a Merge branch 'master' into master 2017-04-05 10:29:52 +02:00
Eugen
78cf0fe1c7 Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
Eugen
18d0e817dd Merge pull request #911 from IMcD23/patch-1
Added mastodon.network instance.
2017-04-05 10:28:58 +02:00
Eugen
b5f8273312 Merge pull request #902 from asm/ssl_best_practices
SSL best practices for nginx
2017-04-05 10:26:32 +02:00
Eugen
3504da5cac Fix API method URL typo 2017-04-05 10:25:05 +02:00
Ian McDowell
8040d1d8ce Update List-of-Mastodon-instances.md
Added mastodon.network.
2017-04-04 23:43:57 -05:00
scriptjunkie
29efeecb9e Add https://securitymastod.one/ 2017-04-04 23:23:15 -05:00
shel
7d354cc8c5 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
fa7b74cf51 SSL best practices for nginx 2017-04-04 18:43:21 -07:00
Ash Furrow
128dcb2825 Adds mastodon.technology 2017-04-04 21:35:45 -04:00
Eugen
94d00f2788 Merge pull request #885 from optikfluffel/patch-1
Update Production-guide.md
2017-04-05 03:24:08 +02:00
Eugen
aa464aa0d8 Merge branch 'master' into patch-1 2017-04-05 03:20:37 +02:00
Eugen
78c1e2e958 Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen
bdaf31bcc9 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
Eugen
f735efdbc1 Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
2017-04-05 03:08:59 +02:00
Eugen
1709dee0f1 Merge pull request #842 from Angristan/patch-2
Missing quotes
2017-04-05 03:08:24 +02:00
Eugen
1c634ad21a Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
2017-04-05 03:07:59 +02:00
Eugen
682c8a6fc8 Merge pull request #848 from ProgVal/patch-3
Add oc.todon.fr to the list of instances.
2017-04-05 03:07:46 +02:00
Eugen
66ec005bf8 Merge pull request #854 from Angristan/patch-3
Fix crontab edit
2017-04-05 03:07:28 +02:00
Eugen
d3dab68978 Merge pull request #891 from ashfurrow/patch-1
Adds instructions for adding admin users for Heroku installs
2017-04-05 03:01:43 +02:00
Eugen
417273326a Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
2017-04-05 02:56:54 +02:00
Ash Furrow
dd441606aa Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen
feea517046 Merge pull request #872 from kwaio/patch-1
typo in admin doc
2017-04-05 02:53:09 +02:00
Jason Snell
50a88d6a6e Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Ash Furrow
04225ed72e Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Udo Kramer
1e5a1b9abd Update Production-guide.md 2017-04-04 23:45:29 +02:00
Nope Nope
dcda852b5f typo in admin doc
s/rails/rake/
2017-04-04 20:45:32 +02:00
Angristan
6091b9b1a9 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.
2017-04-04 19:23:53 +02:00
Pierre Ozoux
41ba74b511 Update the list of instances 2017-04-04 17:28:29 +01:00
Valentin Lorentz
22000ef7a9 Add oc.todon.fr to the list of instances.
[SKIP CI]
2017-04-04 18:11:41 +02:00
Sébastien Santoro
7015578655 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00
Angristan
2fcf8d79ad Fix crontab edit
Missing -u parameter to specify the mastodon user.
2017-04-04 17:23:56 +02:00