Merge pull request #64 from MO-RISE/fix/clean-up-prior-to-going-public

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

README.md

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

docker-compose.auth.yml

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

docker-compose.base.yml

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