B-TECHBW · pmanko · Mar 29, 2022 · Apr 14, 2022
diff --git a/configs/fhir-converter/config.json b/configs/fhir-converter/config.json
@@ -10,8 +10,8 @@
   "mediator": {
     "api": {
       "username": "root@openhim.org",
-      "password": "bw-openhim",
-      "apiURL": "https://core.moh.org.bw",
+      "password": "openhim",
+      "apiURL": "https://openhim-core:8080",
       "trustSelfSigned": false,
       "urn": "urn:mediator:hl7v2tofhir_translator"
     }

diff --git a/configs/opencr/config_port.json b/configs/opencr/config_port.json
@@ -13,7 +13,7 @@
       "password": "openhim",
       "apiURL": "https://openhim-core:8080",
       "trustSelfSigned": true,
-      "urn": ""
+      "urn": "urn:mediator:bw_client_registry"
     },
     "register": true
   },
@@ -66,7 +66,7 @@
     }
   },
   "sync": {
-    "lastFHIR2ESSync": "2022-03-24T18:31:29"
+    "lastFHIR2ESSync": "2022-04-06T09:49:32"
   },
   "__comments": {
     "matching.tool": "this tells if the app should use mediator algorithms or elasticsearch algorithms for matching, two options mediator and elasticsearch"

diff --git a/configs/openhim-console/default.json b/configs/openhim-console/default.json
@@ -2,8 +2,8 @@
     "version": "1.13.2",
     "minimumCoreVersion": "5.2.0",
     "protocol": "https",
-    "host": "openhim-api.moh.org.bw",
-    "hostPath": "",
+    "host": "10.171.5.12",
+    "hostPath": "openhim-api",
     "port": "",
     "title": "Botswana HIE Admin Console",
     "footerTitle": "OpenHIM Administration Console",

diff --git a/configs/traefik/traefik.yml b/configs/traefik/traefik.yml
@@ -1,5 +1,5 @@
 log:
-  level: DEBUG
+  level: INFO
 serversTransport:
   insecureSkipVerify: true
 entryPoints:
@@ -15,8 +15,5 @@ entryPoints:
 api:
   insecure: true
 providers:
-  file:
-    watch: true
-    directory: /etc/traefik/dynamic_conf
   docker:
     exposedByDefault: false
diff --git a/dist/package/docker/.gitkeep b/dist/package/docker/.gitkeep
diff --git a/docker-compose.testing.yml b/docker-compose.testing.yml
@@ -2,7 +2,6 @@ version: '3.8'
 services:
   # Newman Tests
   newman:
-    profiles: ["test"]
     image: postman/newman
     volumes:
       - ./.postman:/.postman
@@ -11,13 +10,13 @@ services:
       - hie
 
   mllp_tests:
-    profiles: ["test"]
     container_name: mllp_tests
-    image: ghcr.io/b-techbw/mllp-tester:latest
+    image: ghcr.io/b-techbw/mllp-tester:main
     networks:
       - hie
+    volumes:
+      - ./test/mllp:/test
 
 networks:
   hie:
-    external: true
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,34 +20,15 @@ services:
     image: traefik:v2.6.1
     container_name: traefik
     ports:
-      - '80:80'
       - '443:443'
-      - '8080:8080'
+      - '8081:8080'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./configs/traefik/traefik.yml:/etc/traefik/traefik.yml
-      - ./configs/traefik/certs.yml:/etc/traefik/dynamic_conf/certs.yml
-      - certs:/etc/certs
+#      - ./configs/traefik/certs.yml:/etc/traefik/dynamic_conf/certs.yml
+      # - certs:/etc/certs
     networks:
       - hie
-    environment:
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
-    - AWS_HOSTED_ZONE_ID
-
-  ## TODO: Set up Traefik for AWS DNS properly and remove
-  certbot:
-    image: certbot/dns-route53
-    container_name: certbot
-    entrypoint: "certbot certonly -n --agree-tos --email pmanko@uw.edu -d 'moh.org.bw' -d '*.moh.org.bw' --dns-route53 --preferred-challenges=dns"
-    environment:
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
-    volumes:
-    - certs:/etc/letsencrypt
-    - letsencrypt:/var/lib/letsencrypt
-    networks:
-    - hie
 
   ###
   # OpenCR
@@ -68,13 +49,12 @@ services:
     labels:
       - 'traefik.enable=true'
       - 'traefik.docker.network=hie-botswana_hie'
-      - 'traefik.http.routers.opencr.rule=Host(`opencr.moh.org.bw`)'
+      - 'traefik.http.routers.opencr.rule=Host(`opencr.moh.org.bw`) || PathPrefix(`/opencr/`)'
+
       - 'traefik.http.routers.opencr.tls=true'
       - 'traefik.http.routers.opencr.entrypoints=web-secure'
       - 'traefik.http.services.opencr.loadbalancer.server.port=3000'
 
-      # - 'traefik.http.routers.opencr.middlewares=add-crux'
-      # - 'traefik.http.middlewares.add-crux.addPrefix.prefix=/crux'
 
   opencr-fhir:
     image: hapiproject/hapi:latest
@@ -128,8 +108,8 @@ services:
       - ./configs/shr/config_ports.json:/app/config/config_docker.json
       - ./configs/shr/mediator_ports.json:/app/config/mediator_docker.json
     # entrypoint: node --inspect-brk=0.0.0.0 dist/app.js
-    # ports:
-    #   - 9229:9229
+    ports:
+       - 80:3001
   shr-fhir:
     image: hapiproject/hapi:latest
     container_name: shr-fhir
@@ -174,17 +154,20 @@ services:
       - 'traefik.http.services.openhim-api.loadbalancer.server.port=8080'
       - 'traefik.http.services.openhim-api.loadbalancer.server.scheme=https'
       - 'traefik.http.routers.openhim-api.service=openhim-api'
-      - 'traefik.http.routers.openhim-api.rule=Host(`openhim-api.moh.org.bw`)'
+      - 'traefik.http.routers.openhim-api.rule=PathPrefix(`/openhim-api`)'
       - 'traefik.http.routers.openhim-api.tls=true'
       - 'traefik.http.routers.openhim-api.entrypoints=web-secure'
+      - 'traefik.http.routers.openhim-api.middlewares=openhim-api-stripprefix'
+      - 'traefik.http.middlewares.openhim-api-stripprefix.stripprefix.prefixes=/openhim-api'
 
       - 'traefik.http.services.openhim-core.loadbalancer.server.port=5000'
       - 'traefik.http.services.openhim-core.loadbalancer.server.scheme=https'
       - 'traefik.http.routers.openhim-core.service=openhim-core'
-      - 'traefik.http.routers.openhim-core.rule=Host(`core.moh.org.bw`)'
+      - 'traefik.http.routers.openhim-core.rule=PathPrefix(`/openhim-core/`)'
       - 'traefik.http.routers.openhim-core.tls=true'
       - 'traefik.http.routers.openhim-core.entrypoints=web-secure'
-
+      - 'traefik.http.routers.openhim-core.middlewares=openhim-core-stripprefix'
+      - 'traefik.http.middlewares.openhim-core-stripprefix.stripprefix.prefixes=/openhim-core'
   openhim-console:
     container_name: openhim-console
     hostname: openhim-console
@@ -200,9 +183,11 @@ services:
     labels:
       - 'traefik.enable=true'
       - 'traefik.docker.network=hie-botswana_hie'
-      - 'traefik.http.routers.openhim-console.rule=Host(`openhim.moh.org.bw`)'
+      - 'traefik.http.routers.openhim-console.rule=PathPrefix(`/openhim/`)'
       - 'traefik.http.routers.openhim-console.tls=true'
       - 'traefik.http.routers.openhim-console.entrypoints=web-secure'
+      - 'traefik.http.routers.openhim-console.middlewares=openhim-console-stripprefix'
+      - 'traefik.http.middlewares.openhim-console-stripprefix.stripprefix.prefixes=/openhim'
     networks:
       - hie
 
@@ -237,7 +222,7 @@ services:
     labels:
       - 'traefik.enable=true'
       - 'traefik.docker.network=hie-botswana_hie'
-      - 'traefik.http.routers.converter.rule=Host(`converter.moh.org.bw`)'
+      - 'traefik.http.routers.converter.rule=Host(`converter.moh.org.bw`) || PathPrefix(`/converter/`)'
       - 'traefik.http.routers.converter.tls=true'
       - 'traefik.http.routers.converter.entrypoints=web-secure'
 
@@ -250,7 +235,7 @@ services:
     networks:
     - hie
     volumes:
-      - /data
+      - /tmp
   kafka:
     image: "bitnami/kafka:latest"
     hostname: kafka
@@ -264,8 +249,6 @@ services:
       - KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE=true
     volumes:
       - kafka-data:/bitnami/kafka
-    depends_on:
-      - zookeeper
     networks:
     - hie
     entrypoint: sh -c 'sleep 30 && /opt/bitnami/scripts/kafka/entrypoint.sh /opt/bitnami/scripts/kafka/run.sh' # prevent zookeeper conflict error
@@ -282,7 +265,7 @@ services:
     labels:
       - 'traefik.enable=true'
       - 'traefik.docker.network=hie-botswana_hie'
-      - 'traefik.http.routers.omang.rule=Host(`omang.moh.org.bw`)'
+      - 'traefik.http.routers.omang.rule=Host(`omang.moh.org.bw`) || PathPrefix(`/omang/`)'
       - 'traefik.http.routers.omang.tls=true'
       - 'traefik.http.routers.omang.entrypoints=web-secure'
     ports:

diff --git a/test/mllp/messages/example-adt.hl7 b/test/mllp/messages/example-adt.hl7
@@ -1,6 +1,6 @@
-MSH|^~\&|DM||||202112231125||ADT^A04|173091|D|2.4|||AL|NE
-EVN||202112231125|||ZZHGGMMO^Healthpost^Mmopane|202112231125
-PID|1||NEW||NAIDOO^HIE TESTING^^^^^F||19700921|M||CT|Plot 40095^^Gaborone^B^0101||791609023^^^user@email.com|00267123608028||S|AC||OMANG986532
-PV1|1|O|HGGMMO||||ZZHGGMMO^Healthpost^Mmopane^^^^^^^^^^XX|||||||||||POV||U|||||||||||||||||||GGC||REG|||202112231125
-NK1|1|NAIDOO^HIEN|BR^Brother|Plot 92215^^Gaborone^B^0101|267 9008922|267 3203532|NOK
+MSH|^~\&|DM||||202203310511||ADT^A04|173091|D|2.4|||AL|NE
+EVN||202203310511|||ZZHGGMMO^Healthpost^Mmopane|202203310511
+PID|1||NEW||MANKO^HIE TESTING^^^^^F||19700921|M||CT|Plot 40095^^Gaborone^B^0101||791609023^^^user@email.com|00267123608028||S|AC||OMANG986532
+PV1|1|O|HGGMMO||||ZZHGGMMO^Healthpost^Mmopane^^^^^^^^^^XX|||||||||||POV||U|||||||||||||||||||GGC||REG|||202203310511
+NK1|1|MANKO^PAWE|BR^Brother|Plot 92215^^Gaborone^B^0101|267 9008922|267 3203532|NOK
 ROL|1|AD|AT|ZZHGGMMO^Healthpost^Mmopane
diff --git a/test/mllp/tests.sh b/test/mllp/tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-hostname="shr"
+hostname="10.175.5.69"
 port=3001
 
 for hl7File in messages/*
@@ -18,4 +18,4 @@ do
   echo $hostname
 
   echo -ne $msg | socat - TCP:$hostname:$port
-done
+done
diff --git a/test/mllp/messages/example-oru.hl7 → test/mllpexample-oru.hl7 b/test/mllp/messages/example-oru.hl7 → test/mllpexample-oru.hl7