Merge branch 'master' into patch-1
This commit is contained in:
Shel R
GitHub
commit
aa6f267117
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,50 @@ Heroku guide
|
|||
|
||||
[](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.
|
||||
|
||||
To make yourself an admin, you may need to use the `heroku` CLI application after creating an account online:
|
||||
|
||||
`heroku rake mastodon:make_admin USERNAME=yourUsername`
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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`.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -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|<https://github.com/ineffyble/tooter>|[@effy@mastodon.social](https://mastodon.social/users/effy)|
|
||||
|tootstream|CLI|<https://github.com/magicalraccoon/tootstream>|[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
|
||||
|HackerNewsBot|CLI|<https://github.com/raymestalez/mastodon-hnbot>|[@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!
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -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|
|
||||
|
|
@ -34,7 +35,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|
|
||||
|
|
@ -47,7 +48,22 @@ 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|
|
||||
| [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|
|
||||
| [mastodon.top](https://mastodon.top) |N/A|Yes|Yes|
|
||||
| [niu.moe](https://niu.moe/)|:dolls: The most cutest node ever, FR/EN, anime and computer :balloon:|Yes|Yes|
|
||||
| [im-in.space](https://im-in.space/)|SPAAAAACE! Probably with a lot of French people. (Invite-only, might randomly open registrations)|No|Yes|
|
||||
| [social.bytestemplar.com](https://social.bytestemplar.com)|N/A|Yes|No|
|
||||
| [digitalhumanities.club](http://www.digitalhumanities.club)|[Digital humanities](http://whatisdigitalhumanities.com) community; invitations will open once code of conduct drafted.|No|No
|
||||
| [design.vu](https://design.vu)|— what's your design view‽|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|
|
||||
| [good-dragon.com](https://good-dragon.com/)|Quick updates, Relaxed Moderation, Federates Everywhere, Furries|Yes|No|
|
||||
| [rich.gop](https://rich.gop/)|Federates everywhere, Open registration, Privacy respected|Yes|Yes|
|
||||
| [social.nowa.re](https://social.nowa.re)|Open Registration|Yes|No|
|
||||
| [mastodon.ml](http://mastodon.ml) |A chill place to hangout and chat about anime, programming and movies.|Yes|Yes|
|
||||
| [off-the-clock.us](https://off-the-clock.us/)|The work day is over.|Yes|No|
|
||||
| [infinimatix.net](https://infinimatix.net)|Informatics|Yes|Yes|
|
||||
| [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).
|
||||
|
|
|
|||
Loading…
Reference in New Issue