Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
pmanko committed Apr 14, 2022
1 parent f695f42 commit 3a0650d
Show file tree
Hide file tree
Showing 4 changed files with 152 additions and 33 deletions.
2 changes: 1 addition & 1 deletion configs/opencr/config_port.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
}
},
"sync": {
"lastFHIR2ESSync": "2022-03-29T14:27:40"
"lastFHIR2ESSync": "2022-03-30T06:29:29"
},
"__comments": {
"matching.tool": "this tells if the app should use mediator algorithms or elasticsearch algorithms for matching, two options mediator and elasticsearch"
Expand Down
141 changes: 140 additions & 1 deletion configs/openhim/config.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,153 @@
{
"bindAddress": "0.0.0.0",
"mongo": {
"url": "mongodb://localhost/openhim",
"atnaUrl": "mongodb://localhost/openhim",
"connectionOptions": {},
"openHIMApiReadPreference": "primaryPreferred",
"openHIMApiWriteConcern": 1,
"openHIMApiReadConcern": "local"
},
"logger": {
"level": "info",
"logToDB": true,
"capDBLogs": true,
"capSize": 10000000
},
"mongoLogger": {
"options": {
"w": 0,
"useNewUrlParser": true
}
},
"router": {
"externalHostname": "localhost",
"httpPort": 5001,
"httpsPort": 5000,
"timeout": 60000
},
"bodyCull":{
"enabled":true,
"pollPeriodMins": 60
},
"api": {
"enabled": true,
"protocol": "https",
"port": 8080,
"authWindowSeconds": 10,
"maxBodiesSizeMB": 15,
"maxPayloadSizeMB": 50,
"truncateSize": 15000,
"truncateAppend": "\n[truncated ...]",
"authenticationTypes": ["token"]
},
"rerun": {
"httpPort": 7786,
"host": "localhost",
"processor": {
"enabled": true,
"pollPeriodMillis": 2000
}
},
"tcpAdapter": {
"httpReceiver": {
"httpPort": 7787,
"host": "localhost"
}
},
"polling": {
"enabled": true,
"pollingPort": 7788,
"host": "localhost"
},
"authentication": {
"enableMutualTLSAuthentication": true,
"enableBasicAuthentication": true,
"enableCustomTokenAuthentication": true,
"enableJWTAuthentication": true,
"enableJWTAuthentication": false,
"jwt": {
"secretOrPublicKey": "",
"algorithms": "",
"audience": "",
"issuer": ""
}
},
"email": {
"fromAddress": "[email protected]",
"nodemailer": {
"service": "Gmail",
"auth": {
"user": "[email protected]",
"pass": "password"
}
}
},
"smsGateway": {
"provider": "clickatell",
"config": {
"user": "user",
"pass": "pass",
"apiID": "apiID"
}
},
"alerts": {
"enableAlerts": true,
"pollPeriodMinutes": 1,
"himInstance": "Local OpenHIM",
"consoleURL": "http://localhost:9000"
},
"reports": {
"enableReports": true,
"dailyReportAt": "0 7 * * *",
"weeklyReportAt": "0 7 * * 1",
"utcOffset": null
},
"events": {
"enableTSNormalization": true
},
"newUserExpiry": {
"duration": 7,
"durationType": "days"
},
"userPasswordResetExpiry": {
"duration": 1,
"durationType": "hours"
},
"auditing": {
"servers": {
"udp": {
"enabled": false,
"port": 5050
},
"tls": {
"enabled": false,
"port": 5051
},
"tcp": {
"enabled": false,
"port": 5052
}
},
"auditEvents": {
"interface": "internal",
"host": "localhost",
"port": 5051,
"auditSourceID": "OpenHIM"
}
},
"caching": {
"enabled": true,
"refreshMillis": 1000
},
"tlsClientLookup": {
"type": "strict"
},
"agenda": {
"startupDelay": 500
},
"certificateManagement": {
"watchFSForCert": false,
"certPath": "/etc/letsencrypt/live/openhim.jembi.org/cert.pem",
"keyPath": "/etc/letsencrypt/live/openhim.jembi.org/privkey.pem"
}
}
21 changes: 11 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ services:
volumes:
- ./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
entrypoint: node --inspect-brk=0.0.0.0 dist/app.js
ports:
- 3001:3001
shr-fhir:
Expand Down Expand Up @@ -147,28 +147,28 @@ services:
- hie
volumes:
- ./configs/openhim/healthcheck.js:/healthcheck.js
# - ./configs/openhim/config.json:/app/config/default.json
- ./configs/openhim/config.json:/app/config/default.json
labels:
- 'traefik.enable=true'
- 'traefik.docker.network=hie-botswana_hie'

- '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=PathPrefix(`/openhim-api`)'
- 'traefik.http.routers.openhim-api.rule=Host(`openhim-api.moh.org.bw`)'
- '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.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=PathPrefix(`/openhim-core/`)'
- 'traefik.http.routers.openhim-core.rule=Host(`core.moh.org.bw`)'
- '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'
# - '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
Expand Down Expand Up @@ -268,11 +268,12 @@ services:
labels:
- 'traefik.enable=true'
- 'traefik.docker.network=hie-botswana_hie'
- 'traefik.http.routers.omang.rule=Host(`omang.moh.org.bw`) || PathPrefix(`/omang/`)'
- 'traefik.http.routers.omang.rule=Host(`omang.moh.org.bw`)'
- 'traefik.http.routers.omang.tls=true'
- 'traefik.http.routers.omang.entrypoints=web-secure'
ports:
- "8085:80"
- 8088:80

oracle-db:
hostname: oracle-db
container_name: oracle-db
Expand Down
21 changes: 0 additions & 21 deletions testing.docker-compose.yml

This file was deleted.

0 comments on commit 3a0650d

Please sign in to comment.