Merge branch 'master' of github.com:tsileo/microblog.pub

This commit is contained in:
Thomas Sileo 2018-06-04 19:10:18 +02:00
commit 0870e22587

View file

@ -75,7 +75,7 @@ Edit `config/me.yml` to add the above-generated password, like so:
``` ```
username: 'username' username: 'username'
name: 'You Name' name: 'Your Name'
icon_url: 'https://you-avatar-url' icon_url: 'https://you-avatar-url'
domain: 'your-domain.tld' domain: 'your-domain.tld'
summary: 'your summary' summary: 'your summary'
@ -85,6 +85,8 @@ pass: $2b$12$iW497g...
### Deployment ### Deployment
Note: some of the docker yml files use version 3 of [docker-compose](https://docs.docker.com/compose/install/).
```shell ```shell
$ docker-compose up -d $ docker-compose up -d
``` ```
@ -100,7 +102,7 @@ $ pip install -r requirements.txt
# Start the Celery worker, RabbitMQ and MongoDB # Start the Celery worker, RabbitMQ and MongoDB
$ docker-compose -f docker-compose-dev.yml up -d $ docker-compose -f docker-compose-dev.yml up -d
# Run the server locally # Run the server locally
$ MICROBLOGPUB_DEBUG=1 FLASK_APP=app.py flask run -p 5005 --with-threads $ FLASK_DEBUG=1 MICROBLOGPUB_DEBUG=1 FLASK_APP=app.py flask run -p 5005 --with-threads
``` ```
## API ## API