Commit Graph

56 Commits

Author SHA1 Message Date
wxcafé d960311faa Merge pull request #23 from foozmeat/pr-cron
simplified the cronjob section
2017-04-13 19:30:43 +02:00
James Moore b8cd7a99d4 removed weird dot characters 2017-04-13 10:28:57 -07:00
codl 0005b49faf example nginx: remove includeSubDomains from hsts 2017-04-13 10:28:50 +02:00
James Moore 9c679e3741 simplified the cronjob section 2017-04-12 21:57:04 -07:00
Shel R 35f696b95e Merge pull request #16 from expenses/master
Added ngrok link
2017-04-12 12:39:39 -04:00
Shel R bd5972626a Merge pull request #6 from Komic/master
Adding an Apache configuration example
2017-04-12 12:22:40 -04:00
Expenses d31186318a Added ngrok link 2017-04-12 20:18:53 +12:00
Komic d75e3d6087 Adding an Apache configuration example
(also added my instance)
2017-04-11 19:38:41 +02:00
Ash Furrow 7303db4934 Updated Heroku deploy guide. 2017-04-11 13:21:59 -04:00
Eugen Rochko eebeee2b76 Up-to-date dump from main repository 2017-04-11 17:48:27 +02:00
Ash Furrow acae9db314 Adds user confirmation rake task (#1300)
* Adds task to confirm user by email.

* Adds documentation for manual confirmation.
2017-04-09 01:09:46 +02:00
Eugen 5c962c196f Merge pull request #1115 from vmincev/patch-1
Update Production-guide.md
2017-04-08 11:38:54 +02:00
Shel R 210477bfb2 Merge branch 'master' into patch-1 2017-04-07 22:59:07 -04:00
David Huerta e8e607a356 Merge branch 'master' into patch-1 2017-04-07 19:46:07 -04:00
Eugen 266cf6c3c2 Merge pull request #1204 from benklop/patch-1
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
benklop be8680df9a Update Administration-guide.md
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
David Huerta 774b752498 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 9efa356f9c 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
Eugen b44df8f36c Merge pull request #1191 from d3vgru/master
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
Eugen b1501669f9 Merge pull request #1172 from mjankowski/mj-heroku-docs
Update heroku instructions
2017-04-07 22:50:31 +02:00
seekr 7123e2cb5a typo 2017-04-07 16:33:13 -03:00
Ed Knutson b130db887e change suggested cipher for nginx 2017-04-07 14:10:39 -05:00
Matt Jankowski f26e10dd99 Update heroku instructions 2017-04-07 12:50:29 -04:00
Vladimir Mincev 272d25c383 Update Production-guide.md
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02:00
Eugen d09a7460b3 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click
Cosmetic changes to the scalingo deployment
2017-04-06 19:32:12 +02:00
Alex Gleason 77924befb2 Linux users must enable NFS for Vagrant 2017-04-06 12:16:39 -04:00
Jonathan Hurter c3f536126a Make scalingo doc clearer 2017-04-05 17:48:55 +02:00
Eugen 237ff5dd8f Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
Jonathan Hurter a9265eadda Add doc 2017-04-05 16:00:48 +02:00
Angristan 5d21f25944 Add git and curl as dependencies
In some VPS templates, they are not installed by default.
2017-04-05 14:11:08 +02:00
Angristan 781c555ef5 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
Jason Snell 84b533490d SSL best practices for nginx 2017-04-04 18:43:21 -07:00
Eugen d1d2eb57b7 Merge pull request #885 from optikfluffel/patch-1
Update Production-guide.md
2017-04-05 03:24:08 +02:00
Eugen 48589d1ec3 Merge pull request #842 from Angristan/patch-2
Missing quotes
2017-04-05 03:08:24 +02:00
Eugen 865427092d Merge pull request #854 from Angristan/patch-3
Fix crontab edit
2017-04-05 03:07:28 +02:00
Eugen af710eb5eb 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
Ash Furrow 0a8023314b Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen d7b9a8c1e1 Merge pull request #872 from kwaio/patch-1
typo in admin doc
2017-04-05 02:53:09 +02:00
Ash Furrow eada9ae113 Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Udo Kramer 38bc079678 Update Production-guide.md 2017-04-04 23:45:29 +02:00
Nope Nope 72319ecf7b typo in admin doc
s/rails/rake/
2017-04-04 20:45:32 +02:00
Angristan 080caa0dff 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
Angristan c4afe950bb Fix crontab edit
Missing -u parameter to specify the mastodon user.
2017-04-04 17:23:56 +02:00
Angristan 5714143e53 Missing quotes 2017-04-04 15:57:37 +02:00
walfie eef381b5c6 Fix typo in Heroku guide 2017-04-04 00:00:56 -04:00
Eugen Rochko 5e91a1dfbd Separate background jobs into different queues. ATTENTION: new queue "pull"
must be added to the Sidekiq invokation in your systemd file

The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
2017-04-04 00:53:20 +02:00
Valentin Lorentz 973a74d252 Also fix the start command. 2017-04-03 00:10:51 +02:00
Valentin Lorentz 8b5966b37b Fix install instructions.
Closes GH-745.
2017-04-03 00:08:40 +02:00
Eugen Rochko b505ee3ee2 Add tuning documentation, add <content> tags back to most salmons,
make status pagination headers generation more lax about next page
existing
2017-02-25 03:34:37 +01:00
Tom McAtee bafb096d4f Fixed the URL
Heroku uses the referrer URL to point at the repo that should be deployed; from this page that includes part of a path that breaks the deployment (specifically /blob/master/docs/Running-Mastodon/Heroku-guide.md).

I've replaced the vanilla address with one that includes a specific reference to the root of the repo
2017-02-14 12:46:18 +10:30