mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 09:05:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
David Huerta 2017-04-07 19:46:07 -04:00 committed by GitHub
commit 4fb24a70d3
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.production.sample
View File

@ -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=

3
Dockerfile
View File

@ -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/*

2
docs/Running-Mastodon/Administration-guide.md
View File

@ -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.

6
docs/Running-Mastodon/Heroku-guide.md
View File

@ -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`

1
docs/Using-Mastodon/Apps.md
View File

@ -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!