diff options
| author | David Huerta <huertanix@users.noreply.github.com> | 2017-04-07 19:46:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 19:46:07 -0400 |
| commit | 4fb24a70d38ff1097f36069caf8532741c486135 (patch) | |
| tree | 76d829152fd2d324084cc2524007c658890bbb58 | |
| parent | 36a83cc4f9d00732b1cec97c9bff4427a61025b1 (diff) | |
| parent | a872f2f4c64f4a370fa1a92a28f9c07c1dd3b06d (diff) | |
Merge branch 'master' into patch-1
| -rw-r--r-- | .env.production.sample | 1 | ||||
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | docs/Running-Mastodon/Administration-guide.md | 2 | ||||
| -rw-r--r-- | docs/Running-Mastodon/Heroku-guide.md | 6 | ||||
| -rw-r--r-- | docs/Using-Mastodon/Apps.md | 1 |
5 files changed, 7 insertions, 6 deletions
diff --git a/.env.production.sample b/.env.production.sample index 44ca984b8..d7c04e235 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -29,6 +29,7 @@ OTP_SECRET= # DEFAULT_LOCALE=de # E-mail configuration +# Note: Mailgun and SparkPost (https://sparkpo.st/smtp) each have good free tiers SMTP_SERVER=smtp.mailgun.org SMTP_PORT=587 SMTP_LOGIN= diff --git a/Dockerfile b/Dockerfile index c28287cca..57a8f34e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,8 @@ RUN BUILD_DEPS=" \ && npm install -g npm@3 && npm install -g yarn \ && bundle install --deployment --without test development \ && yarn \ - && npm cache clean \ + && yarn cache clean \ + && npm -g cache clean \ && apk del $BUILD_DEPS \ && rm -rf /tmp/* /var/cache/apk/* diff --git a/docs/Running-Mastodon/Administration-guide.md b/docs/Running-Mastodon/Administration-guide.md index dd69eb303..09b0f1df1 100644 --- a/docs/Running-Mastodon/Administration-guide.md +++ b/docs/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. diff --git a/docs/Running-Mastodon/Heroku-guide.md b/docs/Running-Mastodon/Heroku-guide.md index 16f6930e4..4978a20ac 100644 --- a/docs/Running-Mastodon/Heroku-guide.md +++ b/docs/Running-Mastodon/Heroku-guide.md @@ -81,8 +81,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` diff --git a/docs/Using-Mastodon/Apps.md b/docs/Using-Mastodon/Apps.md index 67b14dc26..b5e1fa36b 100644 --- a/docs/Using-Mastodon/Apps.md +++ b/docs/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|<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! |