Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changing default validity of tokens to 1M (1 month). Also removing th… #64

Merged
merged 1 commit into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The hub have some (not a lot) of expectations on the data format that flows in t
```
time (TIMESTAMPZ) | vessel_id (TEXT) | parameter_id (TEXT) | value (TEXT)
```
* The data ingestor is very flexible in its configuration about how to map data from the MQTT world to the database layout, see https://github.com/MO-RISE/pontos-data-ingestor#specifics. In essence, the only hard requirement is that the payloads are expected to be vaild `JSON`.
* The data ingestor is very flexible in its configuration about how to map data from the MQTT world to the database layout, see https://github.com/MO-RISE/pontos-data-ingestor#specifics. In essence, the only hard requirement is that the payloads are expected to be valid `JSON`.

#### Pontos project specific data format
Within the Pontos project, a more specific data format has been agreed upon, the Pontos Data Format. This data format is described more in detail [here](https://github.com/MO-RISE/pontos-data-format).
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ services:
restart: unless-stopped
environment:
- JWT_ISSUER="pontos-hub"
- JWT_EXPIRY=1w
- JWT_EXPIRY=1M # 1 month
- JWT_SECRET=${PONTOS_JWT_SECRET}
- JWT_CLAIM_role=web_user
- JWT_CLAIM_sub=__token__
Expand Down
7 changes: 3 additions & 4 deletions docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,11 @@ services:
restart: unless-stopped
depends_on:
- emqx
deploy:
mode: replicated
replicas: 3
command:
[
"mqtt --host emqx --port 1883 --user __internal__ subscribe -t '$$share/filterers/PONTOS_INGRESS/+/+/+' --line '{topic} {message}' | sed -u '/^$/d' | sed -u 's/PONTOS_INGRESS/PONTOS_EGRESS/' | mqtt --host emqx --port 1883 --user __internal__ publish --line '{topic} {message}'"
"mqtt --host emqx --port 1883 --user __internal__ subscribe -t '$$share/filterers/PONTOS_INGRESS/+/+/+' --line '{topic} {message}'
| sed -u '/^$/d' | sed -u 's/PONTOS_INGRESS/PONTOS_EGRESS/'
| mqtt --host emqx --port 1883 --user __internal__ publish --line '{topic} {message}'"
]
volumes:
vol-emqx-data:
Expand Down