Skip to content

Commit 8bedfa0

Browse files
committed
fix the new header sizes, oops
1 parent 5692336 commit 8bedfa0

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

README.md

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ $ fly pg attach mastodon-example-db
7070
$ fly deploy -c fly.setup.toml # run `rails db:schema:load`, may take 2-3 minutes
7171
```
7272

73-
### Sending email
73+
#### Sending email
7474

7575
Mastodon sends emails on signup, to confirm email addresses. It also uses emails for password resets, notifications to the server admins, and various other tasks. To have a fully-functioning Mastodon server, you'll need to create an account with an email service like [Postmark](https://postmarkapp.com), get credentials, and provide those credentials to Mastodon as env vars or secrets. See `fly.toml` for an example of the env vars you would set, and then provide your credentials as Fly secrets:
7676

7777
```
7878
$ fly secrets set SMTP_LOGIN=<public token> SMTP_PASSWORD=<secret token>
7979
```
8080

81-
### Custom domain (optional)
81+
#### Custom domain (optional)
8282

8383
1. Edit `fly.toml` and set `LOCAL_DOMAIN` to your custom domain.
8484
2. Run `fly ips list`, and if the list is empty, run `fly ips allocate-v4`.
@@ -111,7 +111,7 @@ $ fly secrets set SMTP_LOGIN=<public token> SMTP_PASSWORD=<secret token>
111111
$ fly deploy
112112
```
113113
114-
### Make yourself an instance admin
114+
#### Make yourself an instance admin
115115
116116
After you've deployed, sign up. You will hopefully get an email, but if you don't, we'll manually confirm your account regardless as part of making you an owner on the instance. Substitute your own username in this command:
117117
@@ -121,9 +121,16 @@ $ fly ssh console -C 'tootctl accounts modify <username> --confirm --role Owner'
121121
122122
## You're done!
123123
124-
Here are some notes on operating your instance in the future:
124+
Enjoy your server.
125125
126-
### Upgrading Mastodon
126+
127+
### Operating your instance
128+
129+
If you still haven't gotten enough, here are some notes on how to operate your instance after it's running.
130+
131+
Useful references for the section include `fly scale show`,
132+
133+
#### Upgrading Mastodon
127134
128135
To upgrade to a new version of Mastodon, change the version number on the first line of `Dockerfile`, and then check the release notes for upgrade instructions.
129136
@@ -146,11 +153,11 @@ After that, just deploy the updated container as usual, and the post-deploy migr
146153
$ fly deploy
147154
```
148155
149-
### Scaling your instance
156+
#### Scaling your instance
150157
151158
If your instance attracts many users (or maybe a few users who follow a huge number of other accounts), you may notice things start to slow down, and you may run out of database, redis, or storage space.
152159
153-
#### A bigger VM
160+
##### A bigger VM
154161
155162
If you need more web processes, or more sidekiq workers, the easiest option is to choose a larger Fly VM size via `fly scale vm`. With a larger VM, you can run more Puma processes by setting `WEB_CONCURRENCY`, and you can run more sidekiq processes by adding lines to your Procfile. Try to aim for about as many Puma+Sidekiq processes as you have cores, and review the CPU usage of your VM to know whether to adjust up or down.
156163

0 commit comments

Comments
 (0)